From 1ea65f0285d7022ce20ef84d4e35e3c94bcb3fbd Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 27 Mar 2012 22:56:02 -0700
Subject: CHUI-51 WIP notifications routig code cleanup phase 1, removal of
 most of llnotificationhandler

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af75d49353..da83ffbab4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2904,6 +2904,7 @@ Would you like to trust this authority?
    icon="alertmodal.tga"
    name="GrantedModifyRights"
    persist="true"
+   log_to_im="true"   
    type="notify">
 [NAME] has given you permission to edit their objects.
   </notification>
@@ -2912,6 +2913,7 @@ Would you like to trust this authority?
    icon="alertmodal.tga"
    name="RevokedModifyRights"
    persist="true"
+   log_to_im="true"   
    type="notify">
 Your privilege to modify [NAME]&apos;s objects has been revoked
   </notification>
@@ -5161,6 +5163,8 @@ The string [STRING_NAME] is missing from strings.xml
   <notification
    icon="notifytip.tga"
    name="IMSystemMessageTip"
+   log_to_im="true"   
+   log_to_chat="true"   
    type="notifytip">
 [MESSAGE]
   </notification>
@@ -5205,6 +5209,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
   <notification
    icon="notifytip.tga"
    name="FriendOnline"
+   log_to_chat="true"
    type="notifytip">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; is Online
@@ -5213,6 +5218,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
+   log_to_chat="true"
    type="notifytip">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; is Offline
@@ -5459,6 +5465,8 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
+   log_to_im="true"   
+   log_to_chat="true"
    type="notifytip">
 [NAME] received your inventory offer.
   </notification>
@@ -5466,6 +5474,8 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
+   log_to_im="true"   
+   log_to_chat="true"
    type="notifytip">
 [NAME] declined your inventory offer.
   </notification>
@@ -5547,6 +5557,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
   <notification
    icon="notify.tga"
    name="PaymentReceived"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>funds</tag>
@@ -5556,6 +5567,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
   <notification
    icon="notify.tga"
    name="PaymentSent"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>funds</tag>
@@ -5700,6 +5712,7 @@ The objects on the selected parcel that are NOT owned by you have been returned
   <notification
    icon="notify.tga"
    name="ServerObjectMessage"
+   log_to_im="true"   
    persist="true"
    type="notify">
 Message from [NAME]:
@@ -6070,6 +6083,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="UserGiveItem"
+   log_to_im ="true"
    type="offer">
 [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
@@ -6125,6 +6139,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOffered"
+   log_to_im="true"
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -6145,6 +6160,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOfferSent"
+   log_to_im="true"   
    type="offer">
 	Teleport offer sent to [TO_NAME]
   </notification>
@@ -6172,6 +6188,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="OfferFriendship"
+   log_to_im="true"
    type="offer">
     <tag>friendship</tag>
     <tag>confirm</tag>
@@ -6195,6 +6212,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="FriendshipOffered"
+   log_to_im="true"   
    type="offer">
     <tag>friendship</tag>
 	You have offered friendship to [TO_NAME]
@@ -6224,6 +6242,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="FriendshipAccepted"
+   log_to_im="true"   
    type="offer">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; accepted your friendship offer.
@@ -6232,6 +6251,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="FriendshipDeclined"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>friendship</tag>
@@ -6241,6 +6261,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
     <notification
    icon="notify.tga"
    name="FriendshipAcceptedByMe"
+   log_to_im="true"   
    type="offer">
     <tag>friendship</tag>
 Friendship offer accepted.
@@ -6249,6 +6270,7 @@ Friendship offer accepted.
   <notification
    icon="notify.tga"
    name="FriendshipDeclinedByMe"
+   log_to_im="true"   
    type="offer">
     <tag>friendship</tag>
 Friendship offer declined.
-- 
cgit v1.2.3


From 10503b13e0cd5b6f89d885982b72ed23ec131e85 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 5 Apr 2012 19:22:37 +0300
Subject: CHUI-77 WIP People panel layout change: filter pane moved inside the
 tab.

---
 .../newview/skins/default/xui/en/panel_people.xml  | 587 ++++++++++-----------
 1 file changed, 285 insertions(+), 302 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 98c7c49ff4..919661eff6 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -60,21 +60,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string
 	 name="AltMiniMapToolTipMsg"
 	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
-	<filter_editor
-     follows="left|top|right"
-     height="23"
-     layout="topleft"
-     left="10"
-     label="Filter"
-     max_length_chars="300"
-     name="filter_input"
-     text_color="Black"
-     text_pad_left="10"
-     top="3"
-     width="303" />
     <tab_container
      follows="all"
-     height="383"
+     height="419"
      layout="topleft"
      left="3"
      name="tabs"
@@ -82,10 +70,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
-     top_pad="10"
+     top="0"
      halign="center"
      width="319">
-     	<panel
+        <panel
          background_opaque="true"
          background_visible="true"
          bg_alpha_color="DkGray"
@@ -99,13 +87,85 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="nearby_panel"
          top="0"
          width="313">
+            <panel
+             follows="left|top|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="nearby_buttons_panel"
+             top="0"
+             width="313">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="3"
+                 label="Filter"
+                 max_length_chars="300"
+                 name="nearby_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="2"
+                 width="167" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="10"
+                 name="nearby_sort_btn"
+                 top="1"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Hierarchy_View_Disabled"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="nearby_view_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="nearby_add_btn"
+                 top="1"
+                 width="31" />
+                <dnd_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="nearby_del_btn"
+                 top="1"
+                 width="31"/>
+            </panel>
          <layout_stack
            clip="false"
            follows="all"
            height="355"
            layout="topleft"
+           left="0"
            mouse_opaque="false"
            orientation="vertical"
+           top_pad="0"
            width="313">
            <layout_panel
              height="142"
@@ -147,54 +207,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                width="306" />
            </layout_panel>
          </layout_stack>
-         <panel
-             background_visible="true"
-             follows="left|right|bottom"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-             <menu_button
-             follows="bottom|left"
-             height="25"
-             image_hover_unselected="Toolbar_Left_Over"
-             image_overlay="OptionsMenu_Off"
-             image_selected="Toolbar_Left_Selected"
-             image_unselected="Toolbar_Left_Off"
-             layout="topleft"
-             left="0"
-             name="nearby_view_sort_btn"
-             tool_tip="Options"
-             top="1"
-             width="31" />
-             <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_friend_btn"
-                 tool_tip="Add selected Resident to your friends List"
-                 width="31">
-               <commit_callback
-                  function="People.addFriend" />
-             </button>
-             <icon
-             follows="bottom|left|right"
-             height="25"
-             image_name="Toolbar_Right_Off"
-             layout="topleft"
-             left_pad="1"
-             name="dummy_icon"
-             width="243"
-             />
-            </panel>
         </panel>
         <panel
          background_opaque="true"
@@ -210,6 +222,76 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="friends_panel"
          top="0"
          width="313">
+            <panel
+             follows="left|top|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="friends_buttons_panel"
+             top="0"
+             width="313">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="3"
+                 label="Filter"
+                 max_length_chars="300"
+                 name="friends_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="2"
+                 width="167" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="10"
+                 name="friends_sort_btn"
+                 top="1"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Hierarchy_View_Disabled"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="friends_view_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="friends_add_btn"
+                 top="1"
+                 width="31" />
+                <dnd_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="friends_del_btn"
+                 top="1"
+                 width="31"/>
+            </panel>
             <accordion
        		 background_visible="true"
        		 bg_alpha_color="DkGray2"
@@ -219,7 +301,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              layout="topleft"
              left="3"
              name="friends_accordion"
-             top="0"
+             top_pad="0"
              width="307">
                 <accordion_tab
                  layout="topleft"
@@ -257,153 +339,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                          width="307" />
                 </accordion_tab>
             </accordion>
-            <panel
-             background_visible="true"
-             follows="left|right|bottom"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-             
-             	  <layout_stack
-				   animate="false"
-				   border_size="0"
-				   follows="left|right|bottom"
-				   height="25"
-				   layout="topleft"
-				   orientation="horizontal"
-				   top_pad="1"
-				   left="0"
-				   name="bottom_panel"
-				   width="308">
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="options_gear_btn_panel"
-				       width="32">
-				          <menu_button
-				           follows="bottom|left"
-				           tool_tip="Show additional options"
-				           height="25"
-				           image_hover_unselected="Toolbar_Left_Over"
-				           image_overlay="OptionsMenu_Off"
-				           image_selected="Toolbar_Left_Selected"
-				           image_unselected="Toolbar_Left_Off"
-				           layout="topleft"
-				           left="0"
-				           name="friends_viewsort_btn"
-				           top="0"
-				           width="31" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="add_btn_panel"
-				       width="32">
-				          <button
-				           follows="bottom|left"
-				           height="25"
-				           image_hover_unselected="Toolbar_Middle_Over"
-				           image_overlay="AddItem_Off"
-				           image_selected="Toolbar_Middle_Selected"
-				           image_unselected="Toolbar_Middle_Off"
-				           layout="topleft"
-				           left="0"
-				           name="add_btn"
-				           tool_tip="Offer friendship to a Resident"
-				           top="0"
-				           width="31" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="true"
-				       height="25"
-				       layout="topleft"
-				       name="dummy_panel"
-				       width="210">
-				          <icon
-				           follows="bottom|left|right"
-				           height="25"
-				           image_name="Toolbar_Middle_Off"
-				           layout="topleft"
-				           left="0"
-				           top="0"
-				           name="dummy_icon"
-				           width="210" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="trash_btn_panel"
-				       width="31">
-				          <dnd_button
-				           follows="bottom|left"
-				           height="25"
-				           image_hover_unselected="Toolbar_Right_Over"
-				           image_overlay="TrashItem_Off"
-				           image_selected="Toolbar_Right_Selected"
-				           image_unselected="Toolbar_Right_Off"
-				           left="0"
-				           layout="topleft"
-				           name="del_btn"
-				           tool_tip="Remove selected person from your Friends list"
-				           top="0"
-				           width="31"/>
-				      </layout_panel>
-				  </layout_stack><!--
-             
-               <button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               left="0"
-               name="friends_viewsort_btn"
-               top="1"
-               width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
-             	 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_btn"
-                 tool_tip="Offer friendship to a Resident"
-                 width="31" />
-                <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Middle_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="209"
-             />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Right_Over"
-                 image_overlay="TrashItem_Off"
-                 image_selected="Toolbar_Right_Selected"
-                 image_unselected="Toolbar_Right_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="del_btn"
-                 tool_tip="Remove selected person from your Friends list"
-                 width="31" />
-            --></panel>
             <text
              follows="all"
              height="450"
@@ -431,72 +366,97 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
      Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
     -->
-            <group_list
-             allow_select="true" 
-             follows="all"
-             height="356"
-             layout="topleft"
-             left="3"
-             name="group_list"
-             top="0"
-             width="307" />
             <panel
-             background_visible="true"
-             follows="left|right|bottom"
+             follows="left|top|right"
              height="27"
              label="bottom_panel"
              layout="topleft"
              left="0"
-             name="bottom_panel"
-             top_pad="0"
+             name="groups_buttons_panel"
+             top="0"
              width="313">
-               <menu_button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               left="3"
-               name="groups_viewsort_btn"
-               top="1"
-               width="31" />
-                <button
-                 follows="bottom|left"
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="3"
+                 label="Filter"
+                 max_length_chars="300"
+                 name="groups_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="2"
+                 width="134" />
+                <menu_button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="AddItem_Off"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="10"
+                 name="groups_sort_btn"
+                 top="1"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Hierarchy_View_Disabled"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
-                 name="plus_btn"
-                 tool_tip="Join group/Create new group"
+                 left_pad="2"
+                 name="groups_view_btn"
+                 top="1"
                  width="31" />
                 <button
-                 follows="bottom|left"
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="Activate_Checkmark"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
-                 name="activate_btn"
-                 tool_tip="Activate selected group"
+                 left_pad="2"
+                 name="groups_activate_btn"
+                 top="1"
                  width="31" />
-                 <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Right_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="212"
-             />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="groups_add_btn"
+                 top="1"
+                 width="31" />
+                <dnd_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="groups_del_btn"
+                 top="1"
+                 width="31"/>
             </panel>
+            <group_list
+             allow_select="true" 
+             follows="all"
+             height="356"
+             layout="topleft"
+             left="3"
+             name="group_list"
+             top_pad="0"
+             width="307" />
         </panel>
         <panel
          background_opaque="true"
@@ -512,64 +472,87 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="recent_panel"
          top="0"
          width="313">
-            <avatar_list
-             allow_select="true"
-             follows="all"
-             height="356"
-             layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             show_last_interaction_time="true"
-             top="0"
-             width="307" />
             <panel
-             background_visible="true"
-             follows="left|right|bottom"
+             follows="left|top|right"
              height="27"
              label="bottom_panel"
              layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
+             left="0"
+             name="recent_buttons_panel"
+             top="0"
              width="313">
-               <menu_button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               name="recent_viewsort_btn"
-               top="1"
-               width="31" />
-              <button
-                 follows="bottom|left"
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="3"
+                 label="Filter"
+                 max_length_chars="300"
+                 name="recent_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="2"
+                 width="167" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="10"
+                 name="recent_sort_btn"
+                 top="1"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Hierarchy_View_Disabled"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="recent_view_btn"
+                 top="1"
+                 width="31" />
+                <button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
-                 name="add_friend_btn"
-                 tool_tip="Add selected Resident to your friends List"
-                 width="31">
-                <commit_callback
-                   function="People.addFriend" />
-              </button>
-              <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Right_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="244"
-             />
+                 left_pad="2"
+                 name="recent_add_btn"
+                 top="1"
+                 width="31" />
+                <dnd_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="recent_del_btn"
+                 top="1"
+                 width="31"/>
             </panel>
+            <avatar_list
+             allow_select="true"
+             follows="all"
+             height="356"
+             layout="topleft"
+             left="3"
+             multi_select="true"
+             name="avatar_list"
+             show_last_interaction_time="true"
+             top_pad="0"
+             width="307" />
         </panel>
     </tab_container>
     <panel
-- 
cgit v1.2.3


From 2dc032e3e582d39a04c40b7cfb3366424491b491 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 5 Apr 2012 22:56:18 +0300
Subject: CHUI-78 WIP Added drop-down menus and connected callbacks to the new
 view/sort/add/remove buttons.

---
 .../skins/default/xui/en/menu_group_plus.xml       |   4 +-
 .../default/xui/en/menu_people_friends_sort.xml    |  26 ++++
 .../default/xui/en/menu_people_friends_view.xml    |  26 ++++
 .../xui/en/menu_people_friends_view_sort.xml       |  47 -------
 .../default/xui/en/menu_people_groups_view.xml     |  17 +++
 .../xui/en/menu_people_groups_view_sort.xml        |  26 ----
 .../default/xui/en/menu_people_nearby_sort.xml     |  36 +++++
 .../default/xui/en/menu_people_nearby_view.xml     |  31 +++++
 .../xui/en/menu_people_nearby_view_sort.xml        |  57 --------
 .../default/xui/en/menu_people_recent_sort.xml     |  26 ++++
 .../default/xui/en/menu_people_recent_view.xml     |  18 +++
 .../xui/en/menu_people_recent_view_sort.xml        |  39 ------
 .../newview/skins/default/xui/en/panel_people.xml  | 152 ++++++++++++++++-----
 13 files changed, 299 insertions(+), 206 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_recent_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
index fce7414d80..eca9e7f3c9 100644
--- a/indra/newview/skins/default/xui/en/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_group_plus"
+<toggleable_menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
   <menu_item_call name="item_join" label="Join Group...">
@@ -8,4 +8,4 @@
   <menu_item_call name="item_new" label="New Group...">
     <menu_item_call.on_click function="People.Group.Plus.Action" userdata="new_group" />
   </menu_item_call>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
new file mode 100644
index 0000000000..532e295386
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Status"
+   name="sort_status">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_status" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_status" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
new file mode 100644
index 0000000000..be23e91587
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowIcons" />
+  </menu_item_check>
+  <menu_item_check name="view_permissions" label="View Permissions Granted">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_permissions" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowPermissions" />
+  </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
deleted file mode 100644
index b452f96e7a..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Sort by Name"
-   name="sort_name">
-      <menu_item_check.on_click
-       function="People.Friends.ViewSort.Action"
-       parameter="sort_name" />
-      <menu_item_check.on_check
-       function="People.Friends.ViewSort.CheckItem"
-       parameter="sort_name" />
-  </menu_item_check>
-  <menu_item_check
-   label="Sort by Status"
-   name="sort_status">
-      <menu_item_check.on_click
-       function="People.Friends.ViewSort.Action"
-       parameter="sort_status" />
-      <menu_item_check.on_check
-       function="People.Friends.ViewSort.CheckItem"
-       parameter="sort_status" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Friends.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="FriendsListShowIcons" />
-  </menu_item_check>
-  <menu_item_check name="view_permissions" label="View Permissions Granted">
-    <menu_item_check.on_click
-     function="People.Friends.ViewSort.Action"
-     parameter="view_permissions" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="FriendsListShowPermissions" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
new file mode 100644
index 0000000000..73f79f1e70
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Display Group Icons"
+   layout="topleft"
+   name="Display Group Icons">
+      <menu_item_check.on_click
+       function="People.Groups.ViewSort.Action"
+       parameter="show_icons" />
+      <menu_item_check.on_check
+       function="CheckControl"
+       parameter="GroupListShowIcons" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
deleted file mode 100644
index c710fe3b9b..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu 
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Display Group Icons"
-   layout="topleft"
-   name="Display Group Icons">
-      <menu_item_check.on_click
-       function="People.Groups.ViewSort.Action"
-       parameter="show_icons" />
-      <menu_item_check.on_check
-       function="CheckControl"
-       parameter="GroupListShowIcons" />
-  </menu_item_check>
-  <menu_item_call
-   label="Leave Selected Group"
-   layout="topleft"
-   name="Leave Selected Group">
-      <menu_item_call.on_click
-       function="People.Group.Minus.Action"/>
-      <menu_item_call.on_enable
-       function="People.Group.Minus.Enable"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
new file mode 100644
index 0000000000..cf7f4f4fce
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+     label="Sort by Recent Speakers"
+     name="sort_by_recent_speakers">
+    <menu_item_check.on_click
+       function="People.Nearby.ViewSort.Action"
+       parameter="sort_by_recent_speakers"/>
+    <menu_item_check.on_check
+       function="People.Nearby.ViewSort.CheckItem"
+       parameter="sort_by_recent_speakers"/>
+  </menu_item_check>
+  <menu_item_check
+     label="Sort by Name"
+     name="sort_name">
+    <menu_item_check.on_click
+       function="People.Nearby.ViewSort.Action"
+       parameter="sort_name"/>
+    <menu_item_check.on_check
+       function="People.Nearby.ViewSort.CheckItem"
+       parameter="sort_name"/>
+  </menu_item_check>
+  <menu_item_check
+     label="Sort by Distance"
+     name="sort_distance">
+    <menu_item_check.on_click
+       function="People.Nearby.ViewSort.Action"
+       parameter="sort_distance"/>
+    <menu_item_check.on_check
+       function="People.Nearby.ViewSort.CheckItem"
+       parameter="sort_distance"/>
+  </menu_item_check>
+ </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..187dd3bcb5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_group_plus"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check name="view_icons" label="View People Icons">
+        <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="view_icons" />
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="NearbyListShowIcons" />
+    </menu_item_check>
+    <menu_item_check name ="view_map" label="View Map">
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="NearbyListShowMap" />
+        <menu_item_check.on_click
+         function="ToggleControl"
+         parameter="NearbyListShowMap" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     name="show_blocked_list"
+     label="Show Blocked Residents &amp; Objects">
+        <menu_item_call.on_click
+         function="People.Nearby.ViewSort.Action"
+         userdata="panel_block_list_sidetray" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 614dd693c5..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-     label="Sort by Recent Speakers"
-     name="sort_by_recent_speakers">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_by_recent_speakers"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_by_recent_speakers"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Name"
-     name="sort_name">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_name"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_name"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Distance"
-     name="sort_distance">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_distance"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_distance"/>
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Nearby.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="NearbyListShowIcons" />
-  </menu_item_check>
-  <menu_item_check name ="view_map" label="View Map">
-    <menu_item_check.on_check
-      function="CheckControl"
-      parameter="NearbyListShowMap" />
-    <menu_item_check.on_click
-      function="ToggleControl"
-      parameter="NearbyListShowMap" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_sort.xml
new file mode 100644
index 0000000000..f14be88780
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_sort.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by Most Recent"
+   name="sort_most">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_recent" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_recent" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
new file mode 100644
index 0000000000..5520bc993c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Recent.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="RecentListShowIcons" />
+  </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
deleted file mode 100644
index 485a5a658c..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu 
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Sort by Most Recent"
-   name="sort_most">
-      <menu_item_check.on_click
-       function="People.Recent.ViewSort.Action"
-       parameter="sort_recent" />
-      <menu_item_check.on_check
-       function="People.Recent.ViewSort.CheckItem"
-       parameter="sort_recent" />
-  </menu_item_check>
-  <menu_item_check
-   label="Sort by Name"
-   name="sort_name">
-      <menu_item_check.on_click
-       function="People.Recent.ViewSort.Action"
-       parameter="sort_name" />
-      <menu_item_check.on_check
-       function="People.Recent.ViewSort.CheckItem"
-       parameter="sort_name" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Recent.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="RecentListShowIcons" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 919661eff6..f61b0b3dbd 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -73,6 +73,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      top="0"
      halign="center"
      width="319">
+
+<!-- ================================= NEARBY tab =========================== -->
+
         <panel
          background_opaque="true"
          background_visible="true"
@@ -117,19 +120,23 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="10"
-                 name="nearby_sort_btn"
+                 menu_filename="menu_people_nearby_view.xml"
+                 menu_position="bottomleft"
+                 name="nearby_view_btn"
                  top="1"
                  width="31" />
                 <menu_button
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Hierarchy_View_Disabled"
+                 image_overlay="Inv_Underpants"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="nearby_view_btn"
+                 menu_filename="menu_people_nearby_sort.xml"
+                 menu_position="bottomleft"
+                 name="nearby_sort_btn"
                  top="1"
                  width="31" />
                 <button
@@ -141,10 +148,14 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="nearby_add_btn"
+                 name="add_friend_btn"
                  top="1"
-                 width="31" />
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriend" />
+                </button>
                 <dnd_button
+                 enabled="false"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -155,7 +166,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  name="nearby_del_btn"
                  top="1"
-                 width="31"/>
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                 </dnd_button>
             </panel>
          <layout_stack
            clip="false"
@@ -208,6 +222,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            </layout_panel>
          </layout_stack>
         </panel>
+
+<!-- ================================= FRIENDS tab ========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
@@ -252,19 +269,23 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="10"
-                 name="friends_sort_btn"
+                 menu_filename="menu_people_friends_view.xml"
+                 menu_position="bottomleft"
+                 name="friends_view_btn"
                  top="1"
                  width="31" />
                 <menu_button
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Hierarchy_View_Disabled"
+                 image_overlay="Inv_Underpants"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="friends_view_btn"
+                 menu_filename="menu_people_friends_sort.xml"
+                 menu_position="bottomleft"
+                 name="friends_sort_btn"
                  top="1"
                  width="31" />
                 <button
@@ -278,7 +299,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  name="friends_add_btn"
                  top="1"
-                 width="31" />
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriendWizard" />
+                </button>
                 <dnd_button
                  follows="right"
                  height="25"
@@ -290,7 +314,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  name="friends_del_btn"
                  top="1"
-                 width="31"/>
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                </dnd_button>
             </panel>
             <accordion
        		 background_visible="true"
@@ -348,6 +375,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              width="293"
              wrap="true" />
         </panel>
+
+<!-- ================================= GROUPS tab =========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
@@ -396,19 +426,22 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="10"
-                 name="groups_sort_btn"
+                 menu_filename="menu_people_groups_view.xml"
+                 menu_position="bottomleft"
+                 name="groups_view_btn"
                  top="1"
                  width="31" />
                 <menu_button
+                 enabled="false"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Hierarchy_View_Disabled"
+                 image_overlay="Inv_Underpants"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="groups_view_btn"
+                 name="groups_sort_btn"
                  top="1"
                  width="31" />
                 <button
@@ -420,10 +453,13 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="groups_activate_btn"
+                 name="activate_btn"
                  top="1"
-                 width="31" />
-                <button
+                 width="31">
+                    <commit_callback
+                     function="People.Group.Activate" />
+                </button>
+                <menu_button
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -432,9 +468,14 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="groups_add_btn"
+                 menu_filename="menu_group_plus.xml"
+                 menu_position="bottomleft"
+                 name="minus_btn"
                  top="1"
-                 width="31" />
+                 width="31">
+                    <validate_callback
+                     function="People.Group.Plus.Validate" />
+                </menu_button>
                 <dnd_button
                  follows="right"
                  height="25"
@@ -444,9 +485,12 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  left_pad="2"
                  layout="topleft"
-                 name="groups_del_btn"
+                 name="minus_btn"
                  top="1"
-                 width="31"/>
+                 width="31">
+                    <commit_callback
+                     function="People.Group.Minus" />
+                </dnd_button>
             </panel>
             <group_list
              allow_select="true" 
@@ -458,6 +502,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              top_pad="0"
              width="307" />
         </panel>
+
+<!-- ================================= RECENT tab =========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
@@ -502,19 +549,23 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="10"
-                 name="recent_sort_btn"
+                 menu_filename="menu_people_recent_view.xml"
+                 menu_position="bottomleft"
+                 name="recent_view_btn"
                  top="1"
                  width="31" />
                 <menu_button
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Hierarchy_View_Disabled"
+                 image_overlay="Inv_Underpants"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="recent_view_btn"
+                 menu_filename="menu_people_recent_sort.xml"
+                 menu_position="bottomleft"
+                 name="recent_sort_btn"
                  top="1"
                  width="31" />
                 <button
@@ -526,10 +577,14 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="recent_add_btn"
+                 name="add_friend_btn"
                  top="1"
-                 width="31" />
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriend" />
+                </button>
                 <dnd_button
+                 enabled="false"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -540,7 +595,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  name="recent_del_btn"
                  top="1"
-                 width="31"/>
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                 </dnd_button>
             </panel>
             <avatar_list
              allow_select="true"
@@ -592,7 +650,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		         name="view_profile_btn"
 		         tool_tip="Show picture, groups, and other Residents information"
 		         top="0"
-		         width="67" />	
+		         width="67">
+                    <commit_callback
+                     function="People.ViewProfile" />
+		        </button>
 			</layout_panel>
 			
 			<layout_panel
@@ -612,7 +673,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		         name="im_btn"
 		         tool_tip="Open instant message session"
 		         top="0"
-		         width="40" />			
+		         width="40">
+                    <commit_callback
+                     function="People.IM" />
+		        </button>			
 			</layout_panel>
 			
 			<layout_panel
@@ -632,7 +696,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		         name="call_btn"
 		         tool_tip="Call this Resident"
 		         top="0"
-		         width="51" />		
+		         width="51">
+                    <commit_callback
+                     function="People.Call" />
+		        </button>		
 			</layout_panel>
 			
 			<layout_panel
@@ -652,7 +719,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		         name="share_btn"
 		         tool_tip="Share an inventory item"
 		         top="0"
-		         width="65" />	
+		         width="65">
+                    <commit_callback
+                     function="People.Share" />
+		        </button>	
 			</layout_panel>
 			
 			<layout_panel
@@ -672,7 +742,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		         name="teleport_btn"
 		         tool_tip="Offer teleport"
 		         top="0"
-		         width="76" />		
+		         width="76">
+                    <commit_callback
+                     function="People.Teleport" />
+		        </button>
 			</layout_panel>
 		</layout_stack>
 		
@@ -706,7 +779,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		        name="group_info_btn"
 		        tool_tip="Show group information"
 		        top="0"
-		        width="107" />		
+		        width="107">
+                    <commit_callback
+                     function="People.GroupInfo" />
+		        </button>		
 			</layout_panel>
 			
 			<layout_panel
@@ -728,7 +804,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 		        name="chat_btn"
 		        tool_tip="Open chat session"
 		        top="0"
-		        width="100" />			
+		        width="100">
+                    <commit_callback
+                     function="People.Chat" />
+		        </button>			
 			</layout_panel>
 		
 			<layout_panel
@@ -750,7 +829,10 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          		name="group_call_btn"
          		tool_tip="Call this group"
 		        top="0"
-         		width="95" />			
+         		width="95">
+                    <commit_callback
+                     function="People.GroupCall" />
+         	    </button>
 			</layout_panel>		
 		</layout_stack>
     </panel>
-- 
cgit v1.2.3


From 7996857500004ed9b717e049423c52be96db9191 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 12 Apr 2012 00:43:37 +0300
Subject: CHUI-80 FIXED Implemented volume indicator pop-up.

It is invoked by clicking on any speaking indicator except yours.
---
 .../skins/default/xui/en/floater_voice_volume.xml  | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_volume.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
new file mode 100644
index 0000000000..9346295d5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE VOLUME"
+ visible="true"
+ width="245">
+    <text
+     follows="top|left|right"
+     font="SansSerifSmall"
+     height="21"
+     left="10"
+     name="avatar_name"
+     parse_urls="false"
+     top="35"
+     text_color="White"
+     translate="false"
+     use_ellipses="true"
+     value="TestString PleaseIgnore"
+     width="225" />
+    <slider
+     follows="top|left"
+     height="23"
+     increment="0.01"
+     left="1"
+     max_val="0.95"
+     min_val="0.05"
+     name="volume_slider"
+     show_text="false"
+     tool_tip="Voice volume"
+     top_pad="0"
+     value="0.5"
+     width="200" />
+    <button
+     follows="top|left"
+     height="16"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     left_pad="0"
+     top_delta="4"
+     name="mute_btn"
+     width="16" />
+</floater>
-- 
cgit v1.2.3


From 4f526f12e6332307c8d3105e5a4f6e35f2dbd3d7 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 6 Apr 2012 19:29:53 +0300
Subject: CHUI-77 WIP Moved setting filter label to XML.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index f61b0b3dbd..5da87456f1 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -38,12 +38,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      name="no_filtered_friends_msg">
          Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
     </string>
-    <string
-     name="people_filter_label"
-     value="Filter People" />
-    <string
-     name="groups_filter_label"
-     value="Filter Groups" />
      <!--
      *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
      They are not defined as translatable in VLT. See EXT-5931
@@ -104,7 +98,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  height="23"
                  layout="topleft"
                  left="3"
-                 label="Filter"
+                 label="Filter People"
                  max_length_chars="300"
                  name="nearby_filter_input"
                  text_color="Black"
@@ -253,7 +247,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  height="23"
                  layout="topleft"
                  left="3"
-                 label="Filter"
+                 label="Filter People"
                  max_length_chars="300"
                  name="friends_filter_input"
                  text_color="Black"
@@ -410,7 +404,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  height="23"
                  layout="topleft"
                  left="3"
-                 label="Filter"
+                 label="Filter Groups"
                  max_length_chars="300"
                  name="groups_filter_input"
                  text_color="Black"
@@ -533,7 +527,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  height="23"
                  layout="topleft"
                  left="3"
-                 label="Filter"
+                 label="Filter People"
                  max_length_chars="300"
                  name="recent_filter_input"
                  text_color="Black"
-- 
cgit v1.2.3


From 5ed0819309dcb9352de51795a0e9338fd7de844a Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 10 Apr 2012 18:03:55 +0300
Subject: CHUI-77 WIP Made per-tab filters work.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 5da87456f1..ad4a840106 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -365,7 +365,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              height="450"
              left="13"
              name="no_friends_help_text"
-             top="10"
+             top="37"
              width="293"
              wrap="true" />
         </panel>
-- 
cgit v1.2.3


From bc4702a7c74977d4f685902b1d6f5d3cb07318d4 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 12 Apr 2012 23:25:12 +0300
Subject: CHUI-90 WIP Removed all buttons and menus from avatar inspectors.

---
 .../skins/default/xui/en/inspect_avatar.xml        | 105 ---------
 .../default/xui/en/menu_inspect_avatar_gear.xml    | 143 ------------
 .../default/xui/en/menu_inspect_self_gear.xml      | 252 ---------------------
 3 files changed, 500 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml

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

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index bc3bcd331b..866d54e4f8 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -94,32 +94,6 @@
      use_ellipses="true"
      width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
     </text>
-    <slider
-     follows="top|left"
-     height="23"
-     increment="0.01"
-     left="1"
-     max_val="0.95"
-     min_val="0.05"
-     name="volume_slider"
-     show_text="false"
-     tool_tip="Voice volume"
-     top_pad="0"
-     value="0.5"
-     width="200" />
-    <button
-     follows="top|left"
-     height="16"
-     image_disabled="Audio_Off"
-     image_disabled_selected="AudioMute_Off"
-     image_hover_selected="AudioMute_Over"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     left_pad="0"
-     top_delta="4"
-     name="mute_btn"
-     width="16" />
     <avatar_icon
      follows="top|left"
      height="38"
@@ -130,83 +104,4 @@
      name="avatar_icon"
      top="10"
      width="38" />
-<!-- Overlapping buttons for default actions
-    llinspectavatar.cpp makes visible the most likely default action 
--->
-    <button
-     follows="top|left"
-     height="20"
-     label="Add Friend"
-     left="8"
-     top="135"
-     name="add_friend_btn"
-     width="90" />
-    <button
-     follows="top|left"
-     height="20"
-     label="IM"
-     left_delta="0"
-     top_delta="0"
-     name="im_btn"
-     width="80"
-     commit_callback.function="InspectAvatar.IM"/>
-	<button
-     follows="top|left"
-     height="20"
-     label="Profile"
-     layout="topleft"
-     name="view_profile_btn"
-     left_delta="96"
-     top_delta="0"
-     tab_stop="false"
-     width="80" />
-      <!--  gear buttons here -->
-  <menu_button
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_avatar_gear.xml"
-     name="gear_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-	<menu_button
-     follows="top|left"
-     height="20"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_self_gear.xml"
-     name="gear_self_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-  <panel 
-    follows="top|left" 
-    top="164" 
-    left="0" 
-    height="60" 
-    width="228" 
-    visible="false"
-    background_visible="true"
-    name="moderator_panel"
-    background_opaque="true" 
-    bg_opaque_color="MouseGray">
-    <button
-      name="disable_voice"
-      label="Disable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      commit_callback.function="InspectAvatar.DisableVoice"/>
-    <button
-      name="enable_voice"
-      label="Enable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      visible="false" 
-      commit_callback.function="InspectAvatar.EnableVoice"/>
-  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 76b188220d..0000000000
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu
-         create_jump_keys="true"
-         layout="topleft"
-         mouse_opaque="false"
-         visible="false"
-         name="Gear Menu">
-  <menu_item_call
-   label="View Profile"
-   enabled="true" 
-   name="view_profile">
-    <menu_item_call.on_click
-     function="InspectAvatar.ViewProfile"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Add Friend"
-   name="add_friend">
-    <menu_item_call.on_click
-     function="InspectAvatar.AddFriend"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.Enable"/>
-  </menu_item_call>
-  <menu_item_call
-   label="IM"
-   name="im">
-    <menu_item_call.on_click
-     function="InspectAvatar.IM"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Call"
-   enabled="true"
-   name="call">
-    <menu_item_call.on_click
-     function="InspectAvatar.Call"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.EnableCall"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Teleport"
-   name="teleport">
-    <menu_item_call.on_click
-     function="InspectAvatar.Teleport"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.EnableTeleportOffer"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Invite to Group"
-   name="invite_to_group">
-    <menu_item_call.on_click
-     function="InspectAvatar.InviteToGroup"/>
-  </menu_item_call>
-  <menu_item_separator />
-  <menu_item_call
-   label="Block"
-   name="block">
-    <menu_item_call.on_click
-     function="InspectAvatar.ToggleMute"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableMute" />
-  </menu_item_call>
-  <menu_item_call
-   label="Unblock"
-   name="unblock">
-    <menu_item_call.on_click
-     function="InspectAvatar.ToggleMute"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableUnmute" />
-  </menu_item_call>
-  <menu_item_call
-   label="Report"
-   name="report">
-    <menu_item_call.on_click
-     function="InspectAvatar.Report"/>
-  </menu_item_call>  
-  <menu_item_call
-   label="Freeze"
-   name="freeze">
-    <menu_item_call.on_click
-     function="InspectAvatar.Freeze"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFreeze"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Eject"
-   name="eject">
-    <menu_item_call.on_click
-     function="InspectAvatar.Eject"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleEject"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Kick"
-   name="kick">
-    <menu_item_call.on_click
-     function="InspectAvatar.Kick"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableGod"/>
-  </menu_item_call>
-  <menu_item_call
-  label="CSR"
-  name="csr">
-    <menu_item_call.on_click
-     function="InspectAvatar.CSR" />
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableGod" />
-  </menu_item_call>
-  <menu_item_call
-   label="Debug Textures"
-   name="debug">
-    <menu_item_call.on_click
-     function="Avatar.Debug"/>
-    <menu_item_call.on_visible
-     function="IsGodCustomerService"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Find On Map"
-   name="find_on_map">
-    <menu_item_call.on_click
-     function="InspectAvatar.FindOnMap"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFindOnMap"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Zoom In"
-   name="zoom_in">
-    <menu_item_call.on_click
-     function="InspectAvatar.ZoomIn"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleZoomIn"/>
-  </menu_item_call>  
-  <menu_item_call
-   label="Pay"
-   name="pay">
-    <menu_item_call.on_click
-     function="InspectAvatar.Pay"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Share"
-   name="share">
-    <menu_item_call.on_click
-     function="InspectAvatar.Share"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
deleted file mode 100644
index 5e7b16ed4a..0000000000
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Self Pie">
-  <menu_item_call
-   label="Sit Down"
-   layout="topleft"
-   name="Sit Down Here">
-    <menu_item_call.on_click
-     function="Self.SitDown"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableSitDown" />
-  </menu_item_call>
-  <menu_item_call
-   label="Stand Up"
-   layout="topleft"
-   name="Stand Up">
-    <menu_item_call.on_click
-     function="Self.StandUp"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableStandUp" />
-  </menu_item_call>
-  <context_menu
-   label="Take Off"
-   layout="topleft"
-   name="Take Off &gt;">
-    <context_menu
-     label="Clothes"
-     layout="topleft"
-     name="Clothes &gt;">
-      <menu_item_call
-       enabled="false"
-       label="Shirt"
-       layout="topleft"
-       name="Shirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Pants"
-       layout="topleft"
-       name="Pants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="pants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Skirt"
-       layout="topleft"
-       name="Skirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="skirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Shoes"
-       layout="topleft"
-       name="Shoes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shoes" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Socks"
-       layout="topleft"
-       name="Socks">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="socks" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Jacket"
-       layout="topleft"
-       name="Jacket">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="jacket" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Gloves"
-       layout="topleft"
-       name="Gloves">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="gloves" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-            enabled="false"
-            label="Undershirt"
-            layout="topleft"
-            name="Self Undershirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="undershirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Underpants"
-        layout="topleft"
-        name="Self Underpants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="underpants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Tattoo"
-        layout="topleft"
-        name="Self Tattoo">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="tattoo" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Alpha"
-        layout="topleft"
-        name="Self Alpha">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="alpha" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_separator
-       layout="topleft" />
-      <menu_item_call
-       label="All Clothes"
-       layout="topleft"
-       name="All Clothes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="all" />
-      </menu_item_call>
-    </context_menu>
-    <context_menu
-     label="HUD"
-     layout="topleft"
-     name="Object Detach HUD" />
-    <context_menu
-     label="Detach"
-     layout="topleft"
-     name="Object Detach" />
-    <menu_item_call
-     label="Detach All"
-     layout="topleft"
-     name="Detach All">
-      <menu_item_call.on_click
-       function="Self.RemoveAllAttachments"
-       parameter="" />
-      <menu_item_call.on_enable
-       function="Self.EnableRemoveAllAttachments" />
-    </menu_item_call>
-  </context_menu>
-  <menu_item_call
-  label="Change Outfit"
-  layout="topleft"
-  name="Chenge Outfit">
-    <menu_item_call.on_click
-     function="CustomizeAvatar" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit My Outfit"
-  layout="topleft"
-  name="Edit Outfit">
-    <menu_item_call.on_click
-     function="EditOutfit" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit My Shape"
-  layout="topleft"
-  name="Edit My Shape">
-    <menu_item_call.on_click
-     function="EditShape" />
-    <menu_item_call.on_enable
-     function="Edit.EnableEditShape" />
-  </menu_item_call>
-  <menu_item_call
-    label="My Friends"
-    layout="topleft"
-    name="Friends...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="friends_panel" />
-  </menu_item_call>
-  <menu_item_call
-   label="My Groups"
-   layout="topleft"
-   name="Groups...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="groups_panel" />
-  </menu_item_call>
-  <menu_item_call
-    label="My Profile"
-    layout="topleft"
-    name="Profile...">
-    <menu_item_call.on_click
-     function="ShowAgentProfile"
-     parameter="agent" />
-  </menu_item_call>
-  <menu_item_call
-   label="Debug Textures"
-       name="Debug...">
-    <menu_item_call.on_click
-     function="Avatar.Debug" />
-    <menu_item_call.on_visible
-     function="IsGodCustomerService"/>
-  </menu_item_call>
-</toggleable_menu>
-- 
cgit v1.2.3


From 1e74372f50a2cb2ed3364e79344b0408e7e8d89b Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 13 Apr 2012 00:26:33 +0300
Subject: CHUI-90 WIP Added "View full profile" link to avatar inspectors.

---
 indra/newview/skins/default/xui/en/inspect_avatar.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 866d54e4f8..c3481e6d4c 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -9,7 +9,7 @@
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="164"
+ height="130"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
@@ -94,6 +94,17 @@
      use_ellipses="true"
      width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
     </text>
+    <text
+     follows="top|left"
+     height="16"
+     left="8"
+     name="avatar_profile_link"
+     font="SansSerifSmall"
+     text_color="White"
+     top_pad="5"
+     translate="false"
+     value="[[LINK] View full profile]"
+     width="175" />
     <avatar_icon
      follows="top|left"
      height="38"
-- 
cgit v1.2.3


From 3fdcb8751a1f36dbce9d7a3fd1d785160d356d3a Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 13 Apr 2012 23:31:01 +0300
Subject: CHUI-91 FIXED Moved block list to a separate People floater tab.

---
 .../skins/default/xui/en/floater_people.xml        | 10 ++------
 .../default/xui/en/menu_people_friends_view.xml    |  4 ----
 .../default/xui/en/menu_people_nearby_view.xml     |  9 -------
 .../default/xui/en/menu_people_recent_view.xml     |  4 ----
 .../default/xui/en/panel_block_list_sidetray.xml   | 28 ++--------------------
 .../newview/skins/default/xui/en/panel_people.xml  | 28 +++++++++++++++++++++-
 6 files changed, 31 insertions(+), 52 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index d6d8431150..029e4464ea 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -14,13 +14,13 @@
   single_instance="true"
   reuse_instance="true"
   title="PEOPLE"
-  width="333">
+  width="390">
     <panel_container
       default_panel_name="panel_people"
       follows="all"
       height="570"
       name="main_panel"
-      width="333">
+      width="390">
       <panel
         class="panel_people"
         name="panel_people"
@@ -31,11 +31,5 @@
         filename="panel_group_info_sidetray.xml"
         label="Group Profile"
         font="SansSerifBold"/>
-      <panel
-        class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray"
-        filename="panel_block_list_sidetray.xml"
-        label="Blocked Residents &amp; Objects"
-        font="SansSerifBold"/>
     </panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index be23e91587..14a3e1f13d 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -19,8 +19,4 @@
      function="CheckControl"
      parameter="FriendsListShowPermissions" />
   </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
-  </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
index 187dd3bcb5..4c94cf53af 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -19,13 +19,4 @@
          function="ToggleControl"
          parameter="NearbyListShowMap" />
     </menu_item_check>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_call
-     name="show_blocked_list"
-     label="Show Blocked Residents &amp; Objects">
-        <menu_item_call.on_click
-         function="People.Nearby.ViewSort.Action"
-         userdata="panel_block_list_sidetray" />
-    </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
index 5520bc993c..0eaca47d9a 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -11,8 +11,4 @@
      function="CheckControl"
      parameter="RecentListShowIcons" />
   </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 1e6a31d388..84b772d256 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -9,38 +9,14 @@
  min_height="350"
  min_width="240"
  width="280">
-        <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back"
-     left="4"
-     tab_stop="false"
-     top="1"
-     width="30"/>
-    <text
-     follows="top|left|right"
-     font="SansSerifLargeBold"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="title_text"
-     text_color="white"
-     top="5"
-     width="250">
-        Block List
-     </text>
     <scroll_list
      follows="all"
-     height="190"
+     height="220"
      layout="topleft"
      left="5"
      name="blocked"
      tool_tip="List of currently blocked Residents"
-     top="30"
+     top="0"
      width="270">
         <scroll_list.columns
          name="item_name" />
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ad4a840106..03b6c4fb8b 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -66,7 +66,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      tab_position="top"
      top="0"
      halign="center"
-     width="319">
+     right="-5">
 
 <!-- ================================= NEARBY tab =========================== -->
 
@@ -606,6 +606,32 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              top_pad="0"
              width="307" />
         </panel>
+
+<!-- ================================= BLOCKED tab ========================== -->
+
+        <panel
+         background_opaque="true"
+         background_visible="true"
+         bg_alpha_color="DkGray"
+         bg_opaque_color="DkGray"
+         follows="all"
+         height="383"
+         label="BLOCKED"
+         layout="topleft"
+         left="0"
+         help_topic="people_blocked_tab"
+         name="blocked_panel"
+         top="0"
+         width="313">
+          <panel
+           class="panel_block_list_sidetray"
+           height="383"
+           name="panel_block_list_sidetray"
+           filename="panel_block_list_sidetray.xml"
+           label="Blocked Residents &amp; Objects"
+           font="SansSerifBold"
+           width="313" />
+        </panel>
     </tab_container>
     <panel
      follows="bottom|left|right"
-- 
cgit v1.2.3


From cfb2803f1e01cc9596ba3c6dae9679adb454819e Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Sat, 14 Apr 2012 01:10:23 +0300
Subject: CHUI-78 WIP Remove bottom button bar from the people panel.

By the way, removed the "Activate" button from the Groups tab.
---
 .../newview/skins/default/xui/en/panel_people.xml  | 380 ++++-----------------
 1 file changed, 71 insertions(+), 309 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 03b6c4fb8b..f2f6bdd84d 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -55,8 +55,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	 name="AltMiniMapToolTipMsg"
 	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
     <tab_container
+     bottom="-10"
      follows="all"
-     height="419"
      layout="topleft"
      left="3"
      name="tabs"
@@ -75,15 +75,15 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
          label="NEARBY"
          layout="topleft"
          left="0"
          help_topic="people_nearby_tab"
          name="nearby_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
             <panel
              follows="left|top|right"
              height="27"
@@ -91,20 +91,20 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              layout="topleft"
              left="0"
              name="nearby_buttons_panel"
-             top="0"
-             width="313">
+             right="-1"
+             top="0">
                 <filter_editor
                  follows="left|top|right"
                  height="23"
                  layout="topleft"
-                 left="3"
+                 left="6"
                  label="Filter People"
                  max_length_chars="300"
                  name="nearby_filter_input"
                  text_color="Black"
                  text_pad_left="10"
-                 top="2"
-                 width="167" />
+                 top="4"
+                 width="178" />
                 <menu_button
                  follows="right"
                  height="25"
@@ -113,11 +113,11 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="10"
+                 left_pad="7"
                  menu_filename="menu_people_nearby_view.xml"
                  menu_position="bottomleft"
                  name="nearby_view_btn"
-                 top="1"
+                 top="3"
                  width="31" />
                 <menu_button
                  follows="right"
@@ -131,7 +131,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_nearby_sort.xml"
                  menu_position="bottomleft"
                  name="nearby_sort_btn"
-                 top="1"
+                 top_delta="0"
                  width="31" />
                 <button
                  follows="right"
@@ -143,7 +143,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="add_friend_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.AddFriend" />
@@ -159,7 +159,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="nearby_del_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.DelFriend" />
@@ -168,13 +168,13 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          <layout_stack
            clip="false"
            follows="all"
-           height="355"
+           height="410"
            layout="topleft"
            left="0"
            mouse_opaque="false"
            orientation="vertical"
-           top_pad="0"
-           width="313">
+           right="-1"
+           top_pad="0">
            <layout_panel
              height="142"
              layout="topleft"
@@ -191,16 +191,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                left="3"
                mouse_opaque="false"
                name="Net Map"
-               top="4"
-               width="305"/>
+               right="-1"
+               top="4" />
            </layout_panel>
            <layout_panel
              height="213"
              layout="topleft"
              min_dim="100"
              mouse_opaque="false"
-             user_resize="true"
-             width="313">
+             right="-1"
+             user_resize="true">
              <avatar_list
                allow_select="true"
                follows="all"
@@ -211,8 +211,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                keep_one_selected="false"
                multi_select="true"
                name="avatar_list"
-               top="2"
-               width="306" />
+               right="-1"
+               top="2" />
            </layout_panel>
          </layout_stack>
         </panel>
@@ -224,15 +224,15 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
        background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
          label="MY FRIENDS"
          layout="topleft"
          left="0"
          help_topic="people_friends_tab"
          name="friends_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
             <panel
              follows="left|top|right"
              height="27"
@@ -240,20 +240,20 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              layout="topleft"
              left="0"
              name="friends_buttons_panel"
-             top="0"
-             width="313">
+             right="-1"
+             top="0">
                 <filter_editor
                  follows="left|top|right"
                  height="23"
                  layout="topleft"
-                 left="3"
+                 left="6"
                  label="Filter People"
                  max_length_chars="300"
                  name="friends_filter_input"
                  text_color="Black"
                  text_pad_left="10"
-                 top="2"
-                 width="167" />
+                 top="4"
+                 width="177" />
                 <menu_button
                  follows="right"
                  height="25"
@@ -262,11 +262,11 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="10"
+                 left_pad="8"
                  menu_filename="menu_people_friends_view.xml"
                  menu_position="bottomleft"
                  name="friends_view_btn"
-                 top="1"
+                 top="3"
                  width="31" />
                 <menu_button
                  follows="right"
@@ -280,7 +280,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_friends_sort.xml"
                  menu_position="bottomleft"
                  name="friends_sort_btn"
-                 top="1"
+                 top_delta="0"
                  width="31" />
                 <button
                  follows="right"
@@ -292,7 +292,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="friends_add_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.AddFriendWizard" />
@@ -307,7 +307,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="friends_del_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.DelFriend" />
@@ -318,12 +318,12 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
              follows="all"
-             height="356"
+             height="408"
              layout="topleft"
              left="3"
              name="friends_accordion"
-             top_pad="0"
-             width="307">
+             right="-2"
+             top_pad="2">
                 <accordion_tab
                  layout="topleft"
                  height="172"
@@ -365,8 +365,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              height="450"
              left="13"
              name="no_friends_help_text"
+             right="-13"
              top="37"
-             width="293"
              wrap="true" />
         </panel>
 
@@ -377,15 +377,15 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
        background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
          label="MY GROUPS"
          layout="topleft"
          left="0"
          help_topic="people_groups_tab"
          name="groups_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
     <!--
      *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
      Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
@@ -397,20 +397,20 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              layout="topleft"
              left="0"
              name="groups_buttons_panel"
-             top="0"
-             width="313">
+             right="-1"
+             top="0">
                 <filter_editor
                  follows="left|top|right"
                  height="23"
                  layout="topleft"
-                 left="3"
+                 left="6"
                  label="Filter Groups"
                  max_length_chars="300"
                  name="groups_filter_input"
                  text_color="Black"
                  text_pad_left="10"
-                 top="2"
-                 width="134" />
+                 top="4"
+                 width="177" />
                 <menu_button
                  follows="right"
                  height="25"
@@ -419,11 +419,11 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="10"
+                 left_pad="8"
                  menu_filename="menu_people_groups_view.xml"
                  menu_position="bottomleft"
                  name="groups_view_btn"
-                 top="1"
+                 top="3"
                  width="31" />
                 <menu_button
                  enabled="false"
@@ -436,23 +436,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="groups_sort_btn"
-                 top="1"
+                 top_delta="0"
                  width="31" />
-                <button
-                 follows="right"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Activate_Checkmark"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="2"
-                 name="activate_btn"
-                 top="1"
-                 width="31">
-                    <commit_callback
-                     function="People.Group.Activate" />
-                </button>
                 <menu_button
                  follows="right"
                  height="25"
@@ -465,7 +450,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_group_plus.xml"
                  menu_position="bottomleft"
                  name="minus_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <validate_callback
                      function="People.Group.Plus.Validate" />
@@ -480,7 +465,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="minus_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.Group.Minus" />
@@ -489,12 +474,12 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
             <group_list
              allow_select="true" 
              follows="all"
-             height="356"
+             height="406"
              layout="topleft"
              left="3"
              name="group_list"
-             top_pad="0"
-             width="307" />
+             right="-2"
+             top_pad="4" />
         </panel>
 
 <!-- ================================= RECENT tab =========================== -->
@@ -511,8 +496,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          left="0"
          help_topic="people_recent_tab"
          name="recent_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
             <panel
              follows="left|top|right"
              height="27"
@@ -520,20 +505,20 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              layout="topleft"
              left="0"
              name="recent_buttons_panel"
-             top="0"
-             width="313">
+             right="-1"
+             top="0">
                 <filter_editor
                  follows="left|top|right"
                  height="23"
                  layout="topleft"
-                 left="3"
+                 left="6"
                  label="Filter People"
                  max_length_chars="300"
                  name="recent_filter_input"
                  text_color="Black"
                  text_pad_left="10"
-                 top="2"
-                 width="167" />
+                 top="4"
+                 width="177" />
                 <menu_button
                  follows="right"
                  height="25"
@@ -542,11 +527,11 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="10"
+                 left_pad="8"
                  menu_filename="menu_people_recent_view.xml"
                  menu_position="bottomleft"
                  name="recent_view_btn"
-                 top="1"
+                 top="3"
                  width="31" />
                 <menu_button
                  follows="right"
@@ -560,7 +545,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_recent_sort.xml"
                  menu_position="bottomleft"
                  name="recent_sort_btn"
-                 top="1"
+                 top_delta="0"
                  width="31" />
                 <button
                  follows="right"
@@ -572,7 +557,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="add_friend_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.AddFriend" />
@@ -588,7 +573,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="recent_del_btn"
-                 top="1"
+                 top_delta="0"
                  width="31">
                     <commit_callback
                      function="People.DelFriend" />
@@ -597,14 +582,14 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
             <avatar_list
              allow_select="true"
              follows="all"
-             height="356"
+             height="351"
              layout="topleft"
              left="3"
              multi_select="true"
              name="avatar_list"
              show_last_interaction_time="true"
-             top_pad="0"
-             width="307" />
+             right="-2"
+             top_pad="4" />
         </panel>
 
 <!-- ================================= BLOCKED tab ========================== -->
@@ -633,227 +618,4 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            width="313" />
         </panel>
     </tab_container>
-    <panel
-     follows="bottom|left|right"
-     height="23"
-     layout="topleft"
-     left="8"
-     top_pad="4"
-     name="button_bar"
-     width="313">
-
-<!--********************************Profile; IM; Call, Share, Teleport********************************--> 	
-     	<layout_stack
-     	follows="bottom|left|right"
-		height="23"
-		layout="topleft"
-		name="bottom_bar_ls"
-		left="0"
-		orientation="horizontal"
-		top_pad="0"
-		width="313">
-
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left="0"
-			name="view_profile_btn_lp"
-		    auto_resize="true"
-			width="68">
-				<button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Profile"
-		         layout="topleft"
-		         left="1"
-		         name="view_profile_btn"
-		         tool_tip="Show picture, groups, and other Residents information"
-		         top="0"
-		         width="67">
-                    <commit_callback
-                     function="People.ViewProfile" />
-		        </button>
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="im_btn_lp"
-		    auto_resize="true"
-			width="41">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="IM"
-		         layout="topleft"
-		         name="im_btn"
-		         tool_tip="Open instant message session"
-		         top="0"
-		         width="40">
-                    <commit_callback
-                     function="People.IM" />
-		        </button>			
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="call_btn_lp"
-		    auto_resize="true"
-			width="52">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Call"
-		         layout="topleft"
-		         name="call_btn"
-		         tool_tip="Call this Resident"
-		         top="0"
-		         width="51">
-                    <commit_callback
-                     function="People.Call" />
-		        </button>		
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="share_btn_lp"
-		    auto_resize="true"
-			width="66">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Share"
-		         layout="topleft"
-		         name="share_btn"
-		         tool_tip="Share an inventory item"
-		         top="0"
-		         width="65">
-                    <commit_callback
-                     function="People.Share" />
-		        </button>	
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="teleport_btn_lp"
-		    auto_resize="true"
-			width="77">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Teleport"
-		         layout="topleft"
-		         name="teleport_btn"
-		         tool_tip="Offer teleport"
-		         top="0"
-		         width="76">
-                    <commit_callback
-                     function="People.Teleport" />
-		        </button>
-			</layout_panel>
-		</layout_stack>
-		
-<!--********************************Group Profile; Group Chat; Group Call buttons************************-->			
-		<layout_stack
-     	follows="bottom|left|right"
-		height="23"
-		layout="topleft"
-		mouse_opaque="false"
-		name="bottom_bar_ls1"
-		left="0"
-		orientation="horizontal"
-		top="0"
-		width="313">	
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left="0"			
-			mouse_opaque="false"
-			name="group_info_btn_lp"
-		    auto_resize="true"
-			width="108">
-				<button
-		        follows="bottom|left|right"
-		        left="1"
-		        height="23"
-		        label="Group Profile"
-		        layout="topleft"
-				mouse_opaque="false"
-		        name="group_info_btn"
-		        tool_tip="Show group information"
-		        top="0"
-		        width="107">
-                    <commit_callback
-                     function="People.GroupInfo" />
-		        </button>		
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			mouse_opaque="false"
-			name="chat_btn_lp"
-		    auto_resize="true"
-			width="101">
-				<button
-		        follows="bottom|left|right"
-		        left="1"
-		        height="23"
-		        label="Group Chat"
-		        layout="topleft"
-				mouse_opaque="false"
-		        name="chat_btn"
-		        tool_tip="Open chat session"
-		        top="0"
-		        width="100">
-                    <commit_callback
-                     function="People.Chat" />
-		        </button>			
-			</layout_panel>
-		
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			mouse_opaque="false"
-			name="group_call_btn_lp"
-		    auto_resize="true"
-			width="96">
-				<button
-				follows="bottom|left|right"
-				left="1"
-				height="23"
-         		label="Group Call"
-         		layout="topleft"
-				mouse_opaque="false"
-         		name="group_call_btn"
-         		tool_tip="Call this group"
-		        top="0"
-         		width="95">
-                    <commit_callback
-                     function="People.GroupCall" />
-         	    </button>
-			</layout_panel>		
-		</layout_stack>
-    </panel>
 </panel>
-- 
cgit v1.2.3


From 33e78bfe64240f71bcc40ca34950770ce549dc69 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Sat, 14 Apr 2012 02:04:37 +0300
Subject: CHUI-78 WIP Re-combined view and sort menus in the People panel.

---
 .../default/xui/en/menu_people_friends_sort.xml    | 26 ----------------
 .../default/xui/en/menu_people_friends_view.xml    | 21 +++++++++++++
 .../skins/default/xui/en/menu_people_groups.xml    |  4 +--
 .../default/xui/en/menu_people_nearby_sort.xml     | 36 ----------------------
 .../default/xui/en/menu_people_nearby_view.xml     | 31 +++++++++++++++++++
 .../default/xui/en/menu_people_recent_sort.xml     | 26 ----------------
 .../default/xui/en/menu_people_recent_view.xml     | 21 +++++++++++++
 .../newview/skins/default/xui/en/panel_people.xml  | 35 +++++++++++----------
 8 files changed, 93 insertions(+), 107 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_recent_sort.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
deleted file mode 100644
index 532e295386..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Sort by Name"
-   name="sort_name">
-      <menu_item_check.on_click
-       function="People.Friends.ViewSort.Action"
-       parameter="sort_name" />
-      <menu_item_check.on_check
-       function="People.Friends.ViewSort.CheckItem"
-       parameter="sort_name" />
-  </menu_item_check>
-  <menu_item_check
-   label="Sort by Status"
-   name="sort_status">
-      <menu_item_check.on_click
-       function="People.Friends.ViewSort.Action"
-       parameter="sort_status" />
-      <menu_item_check.on_check
-       function="People.Friends.ViewSort.CheckItem"
-       parameter="sort_status" />
-  </menu_item_check>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index 14a3e1f13d..eab7b8c085 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -3,6 +3,27 @@
      name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Status"
+   name="sort_status">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_status" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_status" />
+  </menu_item_check>
+  <menu_item_separator layout="topleft" />
   <menu_item_check name="view_icons" label="View People Icons">
     <menu_item_check.on_click
      function="People.Friends.ViewSort.Action"
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index 8f89d37dbb..3a450258fa 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_group_plus"
+<toggleable_menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
  mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
   <menu_item_call
@@ -54,4 +54,4 @@
      function="People.Groups.Enable"
      parameter="leave" />
   </menu_item_call>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
deleted file mode 100644
index cf7f4f4fce..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-     label="Sort by Recent Speakers"
-     name="sort_by_recent_speakers">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_by_recent_speakers"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_by_recent_speakers"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Name"
-     name="sort_name">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_name"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_name"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Distance"
-     name="sort_distance">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_distance"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_distance"/>
-  </menu_item_check>
- </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
index 4c94cf53af..da88ca9f4d 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -3,6 +3,37 @@
  name="menu_group_plus"
  left="0" bottom="0" visible="false"
  mouse_opaque="false">
+    <menu_item_check
+       label="Sort by Recent Speakers"
+       name="sort_by_recent_speakers">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+       parameter="sort_by_recent_speakers"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_by_recent_speakers"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Sort by Name"
+       name="sort_name">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="sort_name"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_name"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Sort by Distance"
+       name="sort_distance">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="sort_distance"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_distance"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
     <menu_item_check name="view_icons" label="View People Icons">
         <menu_item_check.on_click
          function="People.Nearby.ViewSort.Action"
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_sort.xml
deleted file mode 100644
index f14be88780..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_recent_sort.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu 
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Sort by Most Recent"
-   name="sort_most">
-      <menu_item_check.on_click
-       function="People.Recent.ViewSort.Action"
-       parameter="sort_recent" />
-      <menu_item_check.on_check
-       function="People.Recent.ViewSort.CheckItem"
-       parameter="sort_recent" />
-  </menu_item_check>
-  <menu_item_check
-   label="Sort by Name"
-   name="sort_name">
-      <menu_item_check.on_click
-       function="People.Recent.ViewSort.Action"
-       parameter="sort_name" />
-      <menu_item_check.on_check
-       function="People.Recent.ViewSort.CheckItem"
-       parameter="sort_name" />
-  </menu_item_check>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
index 0eaca47d9a..1dbc90dd2b 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -3,6 +3,27 @@
      name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
+  <menu_item_check
+   label="Sort by Most Recent"
+   name="sort_most">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_recent" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_recent" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+  <menu_item_separator layout="topleft" />
   <menu_item_check name="view_icons" label="View People Icons">
     <menu_item_check.on_click
      function="People.Recent.ViewSort.Action"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index f2f6bdd84d..ca28e3153c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -114,9 +114,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="7"
-                 menu_filename="menu_people_nearby_view.xml"
+                 menu_filename="menu_people_nearby_gear.xml"
                  menu_position="bottomleft"
-                 name="nearby_view_btn"
+                 name="nearby_gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
@@ -128,9 +128,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 menu_filename="menu_people_nearby_sort.xml"
+                 menu_filename="menu_people_nearby_view.xml"
                  menu_position="bottomleft"
-                 name="nearby_sort_btn"
+                 name="nearby_view_btn"
                  top_delta="0"
                  width="31" />
                 <button
@@ -263,9 +263,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="8"
-                 menu_filename="menu_people_friends_view.xml"
+                 menu_filename="menu_people_friends_gear.xml"
                  menu_position="bottomleft"
-                 name="friends_view_btn"
+                 name="friends_gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
@@ -277,9 +277,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 menu_filename="menu_people_friends_sort.xml"
+                 menu_filename="menu_people_friends_view.xml"
                  menu_position="bottomleft"
-                 name="friends_sort_btn"
+                 name="friends_view_btn"
                  top_delta="0"
                  width="31" />
                 <button
@@ -420,13 +420,12 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="8"
-                 menu_filename="menu_people_groups_view.xml"
+                 menu_filename="menu_people_groups.xml"
                  menu_position="bottomleft"
-                 name="groups_view_btn"
+                 name="groups_gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
-                 enabled="false"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -435,7 +434,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 name="groups_sort_btn"
+                 menu_filename="menu_people_groups_view.xml"
+                 menu_position="bottomleft"
+                 name="groups_view_btn"
                  top_delta="0"
                  width="31" />
                 <menu_button
@@ -449,7 +450,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  menu_filename="menu_group_plus.xml"
                  menu_position="bottomleft"
-                 name="minus_btn"
+                 name="plus_btn"
                  top_delta="0"
                  width="31">
                     <validate_callback
@@ -528,9 +529,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="8"
-                 menu_filename="menu_people_recent_view.xml"
+                 menu_filename="menu_people_recent_gear.xml"
                  menu_position="bottomleft"
-                 name="recent_view_btn"
+                 name="recent_gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
@@ -542,9 +543,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="2"
-                 menu_filename="menu_people_recent_sort.xml"
+                 menu_filename="menu_people_recent_view.xml"
                  menu_position="bottomleft"
-                 name="recent_sort_btn"
+                 name="recent_view_btn"
                  top_delta="0"
                  width="31" />
                 <button
-- 
cgit v1.2.3


From 590890173216570ca834ba1ead66db1a25952247 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Sat, 14 Apr 2012 21:04:37 +0300
Subject: CHUI-78 WIP Made the gear buttons spawn the avatar list context menu.

---
 indra/newview/skins/default/xui/en/panel_people.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ca28e3153c..262c7cbf2c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -105,7 +105,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  text_pad_left="10"
                  top="4"
                  width="178" />
-                <menu_button
+                <button
+                 commit_callback.function="People.Gear"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -114,9 +115,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="7"
-                 menu_filename="menu_people_nearby_gear.xml"
-                 menu_position="bottomleft"
-                 name="nearby_gear_btn"
+                 name="gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
@@ -254,7 +253,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  text_pad_left="10"
                  top="4"
                  width="177" />
-                <menu_button
+                <button
+                 commit_callback.function="People.Gear"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -263,9 +263,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="8"
-                 menu_filename="menu_people_friends_gear.xml"
-                 menu_position="bottomleft"
-                 name="friends_gear_btn"
+                 name="gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
@@ -520,7 +518,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  text_pad_left="10"
                  top="4"
                  width="177" />
-                <menu_button
+                <button
+                 commit_callback.function="People.Gear"
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -529,9 +528,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="8"
-                 menu_filename="menu_people_recent_gear.xml"
-                 menu_position="bottomleft"
-                 name="recent_gear_btn"
+                 name="gear_btn"
                  top="3"
                  width="31" />
                 <menu_button
-- 
cgit v1.2.3


From aa4a9059037d3e75d2c93d7889b460978d41fde1 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 17 Apr 2012 15:44:04 +0300
Subject: CHUI-91 ADDITIONAL_FIX Minor visual layout fixes.

---
 indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml | 9 +++++----
 indra/newview/skins/default/xui/en/panel_people.xml              | 9 ++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 84b772d256..18532da593 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -4,20 +4,21 @@
  follows="left|top|right|bottom"
  height="305"
  layout="topleft"
+ left="0"
  name="block_list_panel"
  help_topic="blocked_list"
  min_height="350"
  min_width="240"
- width="280">
+ right="-1">
     <scroll_list
      follows="all"
      height="220"
      layout="topleft"
-     left="5"
+     left="3"
      name="blocked"
      tool_tip="List of currently blocked Residents"
-     top="0"
-     width="270">
+     right="-1"
+     top="1">
         <scroll_list.columns
          name="item_name" />
         <scroll_list.columns
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 262c7cbf2c..abfb9c7a36 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -604,16 +604,19 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          left="0"
          help_topic="people_blocked_tab"
          name="blocked_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
           <panel
            class="panel_block_list_sidetray"
            height="383"
            name="panel_block_list_sidetray"
            filename="panel_block_list_sidetray.xml"
+           follows="all"
            label="Blocked Residents &amp; Objects"
+           left="0"
            font="SansSerifBold"
-           width="313" />
+           top="0"
+           right="-1" />
         </panel>
     </tab_container>
 </panel>
-- 
cgit v1.2.3


From dde1342fffcf0d90ef22e50405a0c4634ef22a74 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 23 Apr 2012 17:09:18 +0300
Subject: CHUI-93 FIXED Increased People floater minimum width to avoid
 scroller on the tab container.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 029e4464ea..45afe6b70b 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -7,7 +7,7 @@
   height="570"
   help_topic="sidebar_people"
   min_height="440"
-  min_width="333"
+  min_width="390"
   layout="topleft"
   name="floater_people"
   save_rect="true"
-- 
cgit v1.2.3


From 5955e6260e6e263fb089f7cc91c0be482cccdfb8 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 24 Apr 2012 17:10:43 -0700
Subject: CHUI-106 FIX Notifications like Friends online are shown in local
 chat history - no toast given if chat history is open

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index da83ffbab4..73ec6ffdb3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5164,7 +5164,7 @@ The string [STRING_NAME] is missing from strings.xml
    icon="notifytip.tga"
    name="IMSystemMessageTip"
    log_to_im="true"   
-   log_to_chat="true"   
+   log_to_chat="false"   
    type="notifytip">
 [MESSAGE]
   </notification>
@@ -5209,7 +5209,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
   <notification
    icon="notifytip.tga"
    name="FriendOnline"
-   log_to_chat="true"
+   log_to_chat="false"
    type="notifytip">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; is Online
@@ -5218,7 +5218,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
-   log_to_chat="true"
+   log_to_chat="false"
    type="notifytip">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; is Offline
@@ -5466,7 +5466,7 @@ You don&apos;t have permission to copy this.
    icon="notifytip.tga"
    name="InventoryAccepted"
    log_to_im="true"   
-   log_to_chat="true"
+   log_to_chat="false"
    type="notifytip">
 [NAME] received your inventory offer.
   </notification>
@@ -5475,7 +5475,7 @@ You don&apos;t have permission to copy this.
    icon="notifytip.tga"
    name="InventoryDeclined"
    log_to_im="true"   
-   log_to_chat="true"
+   log_to_chat="false"
    type="notifytip">
 [NAME] declined your inventory offer.
   </notification>
-- 
cgit v1.2.3


From cf86247b8c5e199447b7cd3dc645a42a6a645265 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 26 Apr 2012 23:52:57 +0300
Subject: CHUI-78 WIP Reordered and added missing items for People floater gear
 menus.

---
 .../skins/default/xui/en/menu_people_groups.xml    | 23 +++++----
 .../skins/default/xui/en/menu_people_nearby.xml    | 56 +++++++++++++---------
 2 files changed, 44 insertions(+), 35 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index 3a450258fa..1e0364b84e 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -2,6 +2,16 @@
 <toggleable_menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
  mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
+  <menu_item_call
+   label="Activate"
+   name="Activate">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="activate" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="activate" />
+  </menu_item_call>
   <menu_item_call
    label="View Info"
    name="View Info">
@@ -23,7 +33,7 @@
      parameter="chat" />
   </menu_item_call>
   <menu_item_call
-   label="Call"
+   label="Voice call"
    name="Call">
     <menu_item_call.on_click
      function="People.Groups.Action"
@@ -33,17 +43,6 @@
      parameter="call" />
   </menu_item_call>
   <menu_item_separator />
-  <menu_item_call
-   label="Activate"
-   name="Activate">
-    <menu_item_call.on_click
-     function="People.Groups.Action"
-     parameter="activate" />
-    <menu_item_call.on_enable
-     function="People.Groups.Enable"
-     parameter="activate" />
-  </menu_item_call>
-  <menu_item_separator />
   <menu_item_call
    label="Leave"
    name="Leave">
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index d2e35e4cc0..b7c9ab1fe3 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -9,13 +9,40 @@
         <menu_item_call.on_click
          function="Avatar.Profile" />
     </menu_item_call>
+    <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="IM">
+        <menu_item_call.on_click
+         function="Avatar.IM" />
+    </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="Call">
+        <menu_item_call.on_click
+         function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_call" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_call
      label="Add Friend"
      layout="topleft"
      name="Add Friend">
         <menu_item_call.on_click
          function="Avatar.AddFriend" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Avatar.EnableItem"
          parameter="can_add" />
     </menu_item_call>
@@ -30,22 +57,13 @@
          parameter="can_delete" />
     </menu_item_call>
     <menu_item_call
-     label="IM"
+     label="Invite to group..."
      layout="topleft"
-     name="IM">
+     name="Invite">
         <menu_item_call.on_click
-         function="Avatar.IM" />
-    </menu_item_call>
-    <menu_item_call
-     label="Call"
-     layout="topleft"
-     name="Call">
-        <menu_item_call.on_click
-         function="Avatar.Call" />
-        <menu_item_call.on_enable
-         function="Avatar.EnableItem"
-         parameter="can_call" />
+         function="Avatar.InviteToGroup" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_call
      label="Map"
      layout="topleft"
@@ -83,13 +101,5 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-    <menu_item_call
-    label="Offer Teleport"
-    name="teleport">
-      <menu_item_call.on_click
-       function="Avatar.OfferTeleport"/>
-      <menu_item_call.on_enable
-      function="Avatar.EnableItem"
-      parameter="can_offer_teleport"/>
-    </menu_item_call>
+
 </context_menu>
-- 
cgit v1.2.3


From f948ba82a985c2fec5ed1e65a55bd68f6e811197 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 4 May 2012 22:08:13 +0300
Subject: CHUI-103 WIP Added support for showing/hiding timestamp and names,
 replacing own name with (You)

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9752652679..0beb8ed0ab 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -405,6 +405,7 @@ Please try logging in again in a minute.</string>
 	<string name="TrackYourCamera">Track your camera</string>
 	<string name="ControlYourCamera">Control your camera</string>
 	<string name="NotConnected">Not Connected</string>
+	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
 
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">General</string>
-- 
cgit v1.2.3


From fac210075f4c68db372ae0535e332ffe9765a5d1 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 7 May 2012 22:40:56 +0300
Subject: CHUI-105 WIP Added tear-off and return behavior for IM floater. XUI
 changed for Converstions multifloater and IM floater.

---
 .../skins/default/xui/en/floater_im_container.xml  | 111 ++++++++++-----
 .../skins/default/xui/en/floater_im_session.xml    | 158 +++++++++++++++++----
 2 files changed, 205 insertions(+), 64 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e123de46c2..d19b36971f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -3,47 +3,86 @@
  can_close="false"  
  can_minimize="true"
  can_resize="true"
- height="390"
+ height="430"
  layout="topleft"
+ min_width="510"
  name="floater_im_box"
  help_topic="floater_im_box"
  save_rect="true"
  save_visibility="true"
  single_instance="true"
  title="CONVERSATIONS"
- width="396">
-    <tab_container
-     follows="left|right|top|bottom"
-     height="390"
-     layout="topleft"
-     left="1"
-     name="im_box_tab_container"
-     tab_position="bottom"
-     tab_width="64"
-     tab_max_width = "134"
-     tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     halign="left"
-     use_ellipses="true"
-     top="0"
-     width="394">
-      <first_tab
-       tab_bottom_image_flash="Toolbar_Left_Flash"/>
-      <middle_tab
-       tab_bottom_image_flash="Toolbar_Middle_Flash"/>
-      <last_tab
-       tab_bottom_image_flash="Toolbar_Right_Flash"/>
-    </tab_container>
-    <icon
-     color="DefaultShadowLight"
-     enabled="false"
-     follows="left|right|bottom"
-     height="17"
-     image_name="tabarea.tga"
-     layout="bottomleft"
-     left="1"
-     name="im_box_tab_container_icon"
-     bottom="10"
-     width="394" />
+ width="680">
+    <panel
+         border="true"
+         follows="top|bottom|left"
+         layout="topleft"
+         name="conversations_list"
+         opaque="true"
+         top="0"
+         left="5"
+         height="425"
+         width="263">
+             <menu_button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left="5"
+                 name="sort_btn"
+                 top="5"
+                 width="31" />
+             <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+             	 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="4"
+                 name="add_btn"
+                 tool_tip="Add button on the left panel"
+                 width="31">
+             </button>
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TabIcon_Open_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left="228"
+                 name="slide_left_btn"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TabIcon_Close_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_delta="0"
+                 name="slide_right_btn"
+                 width="31" />            
+     </panel>
+    <panel_container
+         follows="all"
+         layout="topleft"
+         name="im_box_tab_container"
+         opaque="true"
+         top="0"
+         left_pad="15"
+         height="430"
+         width="389"
+         min_width="290">         
+     </panel_container>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index ca73883e53..3c3f4ad0e2 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  background_visible="true"
  default_tab_group="1"
  height="355"
@@ -15,28 +14,147 @@
  can_resize="true"
  min_width="250"
  min_height="190">
+    <view
+        follows="all"
+        layout="topleft"
+        name="contents_view"
+        top="0"
+        left="0"
+        height="355"
+        width="394"> 
+     <panel
+         follows="all"
+         layout="topleft"
+         name="toolbar_panel"
+         top="0"
+         left="0"
+         height="35"
+         width="394">         
+             <menu_button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left="5"
+                 name="view_options_btn"
+                 top="5"
+                 width="31" />
+             <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="4"
+                 name="add_btn"
+                 width="31">
+                 <commit_callback
+                    function="Chats.add" />
+             </button>   
+             <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="VoicePTT_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="4"
+                 name="call"
+                 width="31">
+                 <commit_callback
+                    function="Chats.add" />
+             </button>
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Icon_Close_Foreground"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left="283"
+                 name="close_btn"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TabIcon_Open_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="5"
+                 name="slide_left_btn"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TabIcon_Close_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_delta="0"
+                 name="slide_right_btn"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="tearoffbox.tga"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="5"
+                 name="tear_off_btn"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Icon_Dock_Foreground"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_delta="0"
+                 name="return_btn"
+                 width="31" />
+     </panel>
   <layout_stack
    animate="true" 
    default_tab_group="2"
   follows="all"
-  height="320"
+  height="310"
   width="394"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
   tab_group="1"
-  top="20"
+  top_pad="0"
   left="0">
     <layout_panel
       name="im_control_panel_holder"
       min_width="115"
       width="150" 
-      height="320" 
+      height="310" 
       auto_resize="false">
       <panel
         name="panel_im_control_panel"
         layout="topleft"
-        height="320"
+        height="310"
         width="150" 
         follows="all"/>
       </layout_panel>
@@ -46,39 +164,22 @@
        tab_group="2"
        top="0"
        height="200"
-	     width="254"
+	    width="254"
        user_resize="true">
-        <button
-          height="20"
-          follows="left|top"
-          top="0"
-          left="2"
-          image_overlay="TabIcon_Open_Off"
-          layout="topleft"
-          width="25"
-          name="slide_left_btn" />
-         <button
-          height="20"
-          follows="left|top"
-          top="0"
-          left="2"
-          image_overlay="TabIcon_Close_Off"
-          width="25"
-          name="slide_right_btn" />
         <chat_history
-	 font="SansSerifSmall"
-         follows="left|right|top|bottom"
-         height="150"
+	     font="SansSerifSmall"
+         follows="all"
+         height="170"
          name="chat_history"
          parse_highlights="true"
          parse_urls="true"
-        left="1"
+         left="1"
          width="249">
         </chat_history>
         <line_editor
          bottom="0"
          follows="left|right|bottom"
-	 font="SansSerifSmall"
+	     font="SansSerifSmall"
          height="20"
          label="To"
          layout="bottomleft"
@@ -88,4 +189,5 @@
         </line_editor>
     </layout_panel>
   </layout_stack>
+    </view>
 </floater>
-- 
cgit v1.2.3


From 905e56f8823e7513b35b9de4e5c6f8b0b6cca539 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 8 May 2012 23:30:34 +0300
Subject: CHUI-103 FIXED Implemented switching text view modes from pop-up menu

---
 .../skins/default/xui/en/floater_im_session.xml    |  1 +
 .../default/xui/en/menu_im_session_showmodes.xml   | 50 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 3c3f4ad0e2..d90947a80a 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -31,6 +31,7 @@
          height="35"
          width="394">         
              <menu_button
+                 menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..483f24afd0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_modes"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+       label="Compact view"
+       name="compact_view">
+      <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="compact_view"/>
+      <menu_item_check.on_check
+         function="IMSession.Menu.CompactExpandedModes.CheckItem"
+         parameter="compact_view"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Expanded view"
+       name="expanded_view">
+      <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="expanded_view"/>
+      <menu_item_check.on_check
+         function="IMSession.Menu.CompactExpandedModes.CheckItem"
+         parameter="expanded_view"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="IMShowTime" label="Show time">
+        <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="IMShowTime" />
+        <menu_item_check.on_check
+         function="IMSession.Menu.ShowModes.CheckItem"
+         parameter="IMShowTime" />
+        <menu_item_check.on_enable
+         function="IMSession.Menu.ShowModes.Enable"
+         parameter="IMShowTime" />
+    </menu_item_check>
+    <menu_item_check name="IMShowNamesForP2PConv" label="Show names in one-to-one conversations">
+        <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="IMShowNamesForP2PConv" />
+        <menu_item_check.on_check
+         function="IMSession.Menu.ShowModes.CheckItem"
+         parameter="IMShowNamesForP2PConv" />
+        <menu_item_check.on_enable
+         function="IMSession.Menu.ShowModes.Enable"
+         parameter="IMShowNamesForP2PConv" />
+         
+    </menu_item_check>
+</toggleable_menu>
-- 
cgit v1.2.3


From 7eaeb88bc37a747ff82fd37df84592f54c88cdbf Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 10 May 2012 20:40:15 +0300
Subject: CHUI-105 WIP Added expand/collapse behavior for Conversations floater
 messages pane.

---
 .../skins/default/xui/en/floater_im_container.xml  | 44 ++++++++--------------
 .../skins/default/xui/en/floater_im_session.xml    | 41 ++++++++------------
 2 files changed, 30 insertions(+), 55 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index d19b36971f..8a0181bae4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater
- can_close="false"  
+ can_close="true"  
  can_minimize="true"
  can_resize="true"
  height="430"
@@ -17,7 +17,7 @@
          border="true"
          follows="top|bottom|left"
          layout="topleft"
-         name="conversations_list"
+         name="conversations_pane"
          opaque="true"
          top="0"
          left="5"
@@ -29,7 +29,7 @@
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="OptionsMenu_Off"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left="5"
                  name="sort_btn"
@@ -39,7 +39,7 @@
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
+                 image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
              	 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -55,34 +55,20 @@
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="TabIcon_Open_Off"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
                  left="228"
-                 name="slide_left_btn"
+                 name="expand_collapse_btn"
                  width="31" />
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Close_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_delta="0"
-                 name="slide_right_btn"
-                 width="31" />            
-     </panel>
+    </panel>
     <panel_container
-         follows="all"
-         layout="topleft"
-         name="im_box_tab_container"
-         opaque="true"
-         top="0"
-         left_pad="15"
-         height="430"
-         width="389"
-         min_width="290">         
-     </panel_container>
+     follows="all"
+     height="430"
+     layout="topleft"
+     left_pad="15"
+     min_width="290"
+     name="im_box_tab_container"
+     top="0"
+     width="389"/>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d90947a80a..954f646bae 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -12,8 +12,21 @@
  visible="false"
  width="394"
  can_resize="true"
+ can_tear_off="false"
  min_width="250"
  min_height="190">
+    <floater.string
+     name="collapse_icon"
+     value="TabIcon_Open_Off"/>
+    <floater.string
+     name="expand_icon"
+     value="TabIcon_Close_Off"/>
+    <floater.string
+     name="tear_off_icon"
+     value="tearoffbox.tga"/>
+    <floater.string
+     name="return_icon"
+     value="Icon_Dock_Foreground"/>
     <view
         follows="all"
         layout="topleft"
@@ -23,7 +36,7 @@
         height="355"
         width="394"> 
      <panel
-         follows="all"
+         follows="left|top|right"
          layout="topleft"
          name="toolbar_panel"
          top="0"
@@ -95,19 +108,7 @@
                  layout="topleft"
                  top="5"
                  left_pad="5"
-                 name="slide_left_btn"
-                 width="31" />
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Close_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_delta="0"
-                 name="slide_right_btn"
+                 name="expand_collapse_btn"
                  width="31" />
              <button
                  follows="right|top"
@@ -121,18 +122,6 @@
                  left_pad="5"
                  name="tear_off_btn"
                  width="31" />
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Icon_Dock_Foreground"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_delta="0"
-                 name="return_btn"
-                 width="31" />
      </panel>
   <layout_stack
    animate="true" 
-- 
cgit v1.2.3


From df58153514f6b361c65efc5dd6d31d39f68603c0 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 14 May 2012 15:44:57 +0300
Subject: CHUI-113 WIP all voice controls is moved from a IM-control panel to
 the IM floater; IMControlPanel is removed; simplified voice button's listener
 behavior

---
 .../newview/skins/default/xui/en/floater_im_session.xml  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 954f646bae..a332bb5b12 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -15,6 +15,8 @@
  can_tear_off="false"
  min_width="250"
  min_height="190">
+    <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
+    <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
     <floater.string
      name="collapse_icon"
      value="TabIcon_Open_Off"/>
@@ -47,10 +49,10 @@
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
                  height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_hover_unselected="Toolbar_Left_Over"
                  image_overlay="OptionsMenu_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
+                 image_selected="Toolbar_Left_Selected"
+                 image_unselected="Toolbar_Left_Off"
                  layout="topleft"
                  left="5"
                  name="view_options_btn"
@@ -74,14 +76,14 @@
              <button
                  follows="top|left"
                  height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_hover_unselected="Toolbar_Right_Over"
                  image_overlay="VoicePTT_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
+                 image_selected="Toolbar_Right_Selected"
+                 image_unselected="Toolbar_Right_Off"
                  layout="topleft"
                  top="5"
                  left_pad="4"
-                 name="call"
+                 name="voice_call_btn"
                  width="31">
                  <commit_callback
                     function="Chats.add" />
-- 
cgit v1.2.3


From c866b094ee000172f7cd820692f228f3f0afddc8 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 14 May 2012 21:19:18 +0300
Subject: CHUI-113 WIP  clean-up (obsolete code was removed)

---
 .../default/xui/en/panel_im_control_panel.xml      | 166 ---------------------
 1 file changed, 166 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_im_control_panel.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
deleted file mode 100644
index 8fcd6ccbaf..0000000000
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- height="300"
- name="panel_im_control_panel"
- width="150">
-    <avatar_icon
-     follows="left|top"
-     height="105"
-     left_delta="20"
-     name="avatar_icon"
-     top="-5"
-     width="114"/>
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="183"
-     layout="topleft"
-     left="5"
-     name="button_stack"
-     orientation="vertical"
-     top_pad="5"
-     width="145">
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="20"
-         layout="topleft"
-         left="2" 
-         min_height="20"
-         width="140"
-         name="view_profile_btn_panel"
-         top="0" >
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Profile"
-             name="view_profile_btn"
-             top="0"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="add_friend_btn_panel">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Add Friend"
-             name="add_friend_btn"
-             top="5"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="teleport_btn_panel">
-        <button
-             auto_resize="false"
-             follows="left|top|right"
-             height="23"
-             label="Teleport"
-             name="teleport_btn"
-             tool_tip = "Offer to teleport this person"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="share_btn_panel">
-           <button
-             auto_resize="true"
-             follows="left|top|right"
-             height="23"
-             label="Share"
-             name="share_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="pay_btn_panel">
-           <button
-             auto_resize="true"
-             follows="left|top|right"
-             height="23"
-             label="Pay"
-             name="pay_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="call_btn_panel">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Call"
-             name="call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="End Call"
-             name="end_call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             width="140" />
-        </layout_panel>
-      <layout_panel
-       mouse_opaque="false"
-       auto_resize="true"
-       follows="top|left"
-       height="0"
-       layout="topleft"
-       min_height="0"
-       width="140"
-       name="spacer"/>
-    </layout_stack>
-</panel>
-- 
cgit v1.2.3


From 0ed7966bd5471e4152ade9ac63e81406b4d0a679 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 15 May 2012 20:42:14 +0300
Subject: CHUI-105 WIP Remove obsolete controls from the group's control pane

---
 .../default/xui/en/panel_group_control_panel.xml   | 49 ----------------------
 1 file changed, 49 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index ad10e53a4e..a5295ebe01 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -40,55 +40,6 @@
              show_speaking_indicator="false"
              width="145" />
         </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="group_info_btn_panel">
-            <button
-             follows="left|right|bottom"
-             height="23"
-             label="Group Profile"
-             name="group_info_btn"
-             use_ellipses="true"
-             top="5"
-             width="130" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="call_btn_panel">
-            <button
-             follows="all"
-             height="23"
-             label="Call Group"
-             name="call_btn"
-             use_ellipses="true" 
-             width="130" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Leave Call"
-             name="end_call_btn"
-             use_ellipses="true" />
-        </layout_panel>
         <layout_panel
          auto_resize="false"
          follows="top|left|right"
-- 
cgit v1.2.3


From f59aa880395d4b744c89b0a375b21ee2bf429625 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 17 May 2012 02:51:18 +0300
Subject: CHUI-105 WIP Implemented collapsed/expanded state transitions for
 messages and conversation panes. The states and dimensions of Conversations
 floater panes are saved in per account settings.

---
 .../skins/default/xui/en/floater_im_container.xml  | 158 ++++++++++++++-------
 1 file changed, 103 insertions(+), 55 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 8a0181bae4..ce40f44a64 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -5,7 +5,7 @@
  can_resize="true"
  height="430"
  layout="topleft"
- min_width="510"
+ min_height="50"
  name="floater_im_box"
  help_topic="floater_im_box"
  save_rect="true"
@@ -13,62 +13,110 @@
  single_instance="true"
  title="CONVERSATIONS"
  width="680">
-    <panel
-         border="true"
-         follows="top|bottom|left"
-         layout="topleft"
-         name="conversations_pane"
-         opaque="true"
-         top="0"
-         left="5"
-         height="425"
-         width="263">
-             <menu_button
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="OptionsMenu_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left="5"
-                 name="sort_btn"
-                 top="5"
-                 width="31" />
-             <button
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="AddItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="4"
-                 name="add_btn"
-                 tool_tip="Add button on the left panel"
-                 width="31">
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Open_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left="228"
-                 name="expand_collapse_btn"
-                 width="31" />
-    </panel>
-    <panel_container
+    <string
+     name="collapse_icon"
+     value="TabIcon_Open_Off"/>
+    <string
+     name="expand_icon"
+     value="TabIcon_Close_Off"/>
+    <layout_stack
+     animate="true" 
      follows="all"
      height="430"
      layout="topleft"
-     left_pad="15"
-     min_width="290"
-     name="im_box_tab_container"
+     left="0"
+     name="conversations_stack"
+     orientation="horizontal"
      top="0"
-     width="389"/>
+     width="680">
+        <layout_panel
+         auto_resize="true"
+         height="430"
+         name="conversations_layout_panel"
+         min_dim="41"
+         width="268">
+            <layout_stack
+             animate="false" 
+             follows="left|top|right"
+             height="35"
+             layout="topleft"
+             left="0"
+             name="conversations_pane_buttons_stack"
+             orientation="horizontal"
+             top="0"
+             width="268">
+                <layout_panel
+                 auto_resize="true"
+                 height="35"
+                 name="conversations_pane_buttons_expanded">
+                    <menu_button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="OptionsMenu_Off"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     left="10"
+                     name="sort_btn"
+                     top="5"
+                     width="31" />
+                    <button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="AddItem_Off"
+                     image_selected="Toolbar_Middle_Selected"
+                      image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="5"
+                     left_pad="4"
+                     name="add_btn"
+                     tool_tip="Add button on the left panel"
+                     width="31"/>
+                </layout_panel>
+                <layout_panel
+                 auto_resize="false"
+                 height="35"
+                 name="conversations_pane_buttons_collapsed"
+                 width="41">
+                    <button
+                     follows="right|top"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="TabIcon_Open_Off"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="5"
+                     left="5"
+                     name="expand_collapse_btn"
+                     width="31" />
+                </layout_panel>
+            </layout_stack>
+            <panel
+             follows="all"
+             layout="topleft"
+             name="conversations_list_panel"
+             opaque="true"
+             top_pad="0"
+             left="5"
+             height="390"
+             width="263"/>
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         height="430"
+         name="messages_layout_panel"
+         width="412">
+            <panel_container
+             follows="all"
+             height="430"
+             layout="topleft"
+             left="10"
+             name="im_box_tab_container"
+             top="0"
+             width="402"/>
+        </layout_panel>
+    </layout_stack>
 </multi_floater>
-- 
cgit v1.2.3


From 296e55c1b323c05b6544b69ace04afe19102396b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 18 May 2012 13:20:32 -0700
Subject: CHUI-112 FIX Clicking Show or Discard in an inventory offer toast
 does not dismiss toast removed special case logic for dealing with user
 online/offline collisions added ability to cancel old duplicate notifications

---
 .../newview/skins/default/xui/en/notifications.xml | 22 ++++++++++------------
 indra/newview/skins/default/xui/en/strings.xml     |  2 ++
 2 files changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d35cebbd16..5b7222c180 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5208,20 +5208,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
 
   <notification
    icon="notifytip.tga"
-   name="FriendOnline"
+   name="FriendOnlineOffline"
    log_to_chat="false"
    type="notifytip">
     <tag>friendship</tag>
-&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Online
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="FriendOffline"
-   log_to_chat="false"
-   type="notifytip">
-    <tag>friendship</tag>
-&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Offline
+&lt;nolink&gt;[NAME]&lt;/nolink&gt; is [STATUS]
+    <unique combine="cancel_old">
+      <context>NAME</context>
+    </unique>
   </notification>
 
   <notification
@@ -6160,7 +6154,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOfferSent"
-   log_to_im="true"   
+   log_to_im="true"
+   show_toast="false"
    type="offer">
 	Teleport offer sent to [TO_NAME]
   </notification>
@@ -6213,6 +6208,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="FriendshipOffered"
    log_to_im="true"   
+   show_toast="false"   
    type="offer">
     <tag>friendship</tag>
 	You have offered friendship to [TO_NAME]
@@ -6262,6 +6258,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="FriendshipAcceptedByMe"
    log_to_im="true"   
+   show_toast="false"
    type="offer">
     <tag>friendship</tag>
 Friendship offer accepted.
@@ -6271,6 +6268,7 @@ Friendship offer accepted.
    icon="notify.tga"
    name="FriendshipDeclinedByMe"
    log_to_im="true"   
+   show_toast="false"   
    type="offer">
     <tag>friendship</tag>
 Friendship offer declined.
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9752652679..e932310622 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3242,6 +3242,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_moderator_label">(Moderator)</string>
 	<string name="Saved_message">(Saved [LONG_TIMESTAMP])</string>
 	<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
+  <string name="OnlineStatus">Online</string>
+  <string name="OfflineStatus">Offline</string>
 
 	<!-- voice calls -->
 	<string name="answered_call">Your call has been answered</string>
-- 
cgit v1.2.3


From 61d550ee85b371add15d174b4f6fbd93624c3490 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 24 May 2012 19:20:37 +0300
Subject: CHUI-78 FIXED group actions gear menu in People->Groups. Used the
 same menu for groups list context menu and gear menu in People->Groups.
 Changed the type of groups list context menu to toggleable.

---
 indra/newview/skins/default/xui/en/panel_people.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index abfb9c7a36..ceb03d03a9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -418,8 +418,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left_pad="8"
-                 menu_filename="menu_people_groups.xml"
-                 menu_position="bottomleft"
                  name="groups_gear_btn"
                  top="3"
                  width="31" />
-- 
cgit v1.2.3


From 47ec4faeb4dc67f9614e218a75d4957ccf6f794c Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 30 May 2012 19:58:20 +0300
Subject: CHUI-119 WIP Prepare the nearby chat for hosting it by the
 IM-container

---
 .../skins/default/xui/en/floater_chat_bar.xml      | 162 ++++++++++++++++++---
 .../skins/default/xui/en/panel_nearby_chat.xml     |  21 +--
 2 files changed, 151 insertions(+), 32 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
index 63992462b3..7688525e13 100644
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -3,32 +3,151 @@
  open_positioning="specified"
  specified_left="10"
  specified_bottom="10"
- height="60"
+ background_visible="true"
+ default_tab_group="1"
+ height="355"
+ help_topic="chat_bar"
  layout="topleft"
- legacy_header_height="25"
- single_instance="true"
- title="NEARBY CHAT"
- save_rect="true"
- save_visibility="true"
- can_close="true"
+ name="chat_bar"
+ can_dock="false"
  can_minimize="true"
- help_topic="chat_bar"
- min_height="60"
- min_width="150"
+ can_close="true"
+ visible="false"
+ width="394"
  can_resize="true"
- default_tab_group="1"
- name="chat_bar"
- width="300">
+ can_tear_off="false"
+ min_width="250"
+ min_height="80"
+ single_instance="true"
+ title="Nearby chat">
+    <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
+    <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
+    <floater.string
+     name="collapse_icon"
+     value="TabIcon_Open_Off"/>
+    <floater.string
+     name="expand_icon"
+     value="TabIcon_Close_Off"/>
+    <floater.string
+     name="tear_off_icon"
+     value="tearoffbox.tga"/>
+    <floater.string
+     name="return_icon"
+     value="Icon_Dock_Foreground"/>
+     <view
+        follows="all"
+        layout="topleft"
+        name="contents_view"
+        top="0"
+        left="0"
+        height="355"
+        width="394">
+      <panel
+         follows="left|top|right"
+         layout="topleft"
+         name="toolbar_panel"
+         top="0"
+         left="0"
+         height="35"
+         width="394">         
+             <menu_button
+                 menu_filename="menu_im_session_showmodes.xml"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Left_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Left_Selected"
+                 image_unselected="Toolbar_Left_Off"
+                 layout="topleft"
+                 left="5"
+                 name="view_options_btn"
+                 top="5"
+                 width="31" />
+             <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="4"
+                 name="add_btn"
+                 width="31">
+                 <commit_callback
+                    function="Chats.add" />
+             </button>   
+             <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Right_Over"
+                 image_overlay="VoicePTT_Off"
+                 image_selected="Toolbar_Right_Selected"
+                 image_unselected="Toolbar_Right_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="4"
+                 name="voice_call_btn"
+                 width="31">
+                 <commit_callback
+                    function="Chats.add" />
+             </button>
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Icon_Close_Foreground"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left="283"
+                 name="close_btn"
+                 width="31">
+             </button>
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TabIcon_Open_Off"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="5"
+                 name="expand_collapse_btn"
+                 width="31">
+             </button>
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="tearoffbox.tga"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="5"
+                 name="tear_off_btn"
+                 width="31">
+             </button>
+     </panel>
     <panel
-        top="20"
+        top="35"
+        left="0"
         class="panel_nearby_chat"
         follow="all"
-        width="300"
+        width="390"
         height="0"
         visible="false"
         filename="panel_nearby_chat.xml"
         name="nearby_chat" />
-    <panel width="300" 
+    <panel
+    	width="390"
+    	height="10"
+    	visible="true" />
+    <panel width="394" 
            height="31" 
            left="0" 
            name="bottom_panel"
@@ -39,18 +158,15 @@
         border_style="line"
         border_thickness="1"
         follows="left|right"
-        height="23"
+        height="20"
         label="Click here to chat."
         layout="topleft"
-        left_delta="7"
-        left="0"
+        left="1"
         max_length_bytes="1023"
         name="chat_box"
-        text_pad_left="5"
-        text_pad_right="25"
         tool_tip="Press Enter to say, Ctrl+Enter to shout"
         top="2"
-        width="255" />
+        width="384" />
       <output_monitor
         auto_update="true"
         follows="right"
@@ -65,6 +181,7 @@
         width="20" />
       <button
         follows="right"
+        visible="false"
         is_toggle="true"
         width="20"
         top="2"
@@ -81,4 +198,5 @@
         tool_tip="Shows/hides nearby chat log">
       </button>
     </panel>
+  </view>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index d683116eb8..b415ba780d 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="all"
- height="300"
+ top="0"
+ bottom_delta="10"
  help_topic="nearby_chat"
  layout="topleft"
  name="nearby_chat"
- width="320">
+ width="394">
   <layout_stack
    follows="all"
-   height="295"
+   height="278"
    layout="topleft"
    left="0"
    name="stack"
    top="5"
    orientation="vertical"
-   width="320">
+   width="394">
     <layout_panel
      auto_resize="false"
      height="26"
@@ -23,7 +24,7 @@
      name="translate_chat_checkbox_lp"
      top_delta="0"
      visible="true"
-     width="313">
+     width="387">
       <check_box
        top="10"
        control_name="TranslateChat"
@@ -33,15 +34,15 @@
        layout="topleft"
        left="5"
        name="translate_chat_checkbox"
-       width="300" />
+       width="374" />
     </layout_panel>
     <layout_panel
      auto_resize="true"
-     height="277"
+     height="256"
      left_delta="0"
      layout="topleft"
      name="chat_history_lp"
-     width="318">
+     width="394">
       <chat_history
        bg_readonly_color="ChatHistoryBgColor"
        bg_writeable_color="ChatHistoryBgColor"
@@ -49,7 +50,7 @@
        layout="topleft"
        left="5"
        left_widget_pad="0"
-       height="272"
+       height="240"
        name="chat_history"
        parse_highlights="true"
        parse_urls="true"
@@ -57,7 +58,7 @@
        text_color="ChatHistoryTextColor"
        text_readonly_color="ChatHistoryTextColor"
        top="0"
-       width="313" />
+       width="384" />
     </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3


From bba0f4f74e56d911df8fc534d83cd4a84993bc8b Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 31 May 2012 16:37:22 +0300
Subject: CHUI-119 WIP

---
 .../skins/default/xui/en/floater_chat_bar.xml      | 202 ---------------------
 .../skins/default/xui/en/floater_im_session.xml    | 119 +++++++++---
 .../default/xui/en/panel_adhoc_control_panel.xml   |  95 ----------
 .../default/xui/en/panel_group_control_panel.xml   |  60 ------
 .../skins/default/xui/en/panel_nearby_chat.xml     |  19 +-
 5 files changed, 100 insertions(+), 395 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_group_control_panel.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
deleted file mode 100644
index 7688525e13..0000000000
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- open_positioning="specified"
- specified_left="10"
- specified_bottom="10"
- background_visible="true"
- default_tab_group="1"
- height="355"
- help_topic="chat_bar"
- layout="topleft"
- name="chat_bar"
- can_dock="false"
- can_minimize="true"
- can_close="true"
- visible="false"
- width="394"
- can_resize="true"
- can_tear_off="false"
- min_width="250"
- min_height="80"
- single_instance="true"
- title="Nearby chat">
-    <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
-    <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
-    <floater.string
-     name="collapse_icon"
-     value="TabIcon_Open_Off"/>
-    <floater.string
-     name="expand_icon"
-     value="TabIcon_Close_Off"/>
-    <floater.string
-     name="tear_off_icon"
-     value="tearoffbox.tga"/>
-    <floater.string
-     name="return_icon"
-     value="Icon_Dock_Foreground"/>
-     <view
-        follows="all"
-        layout="topleft"
-        name="contents_view"
-        top="0"
-        left="0"
-        height="355"
-        width="394">
-      <panel
-         follows="left|top|right"
-         layout="topleft"
-         name="toolbar_panel"
-         top="0"
-         left="0"
-         height="35"
-         width="394">         
-             <menu_button
-                 menu_filename="menu_im_session_showmodes.xml"
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Left_Over"
-                 image_overlay="OptionsMenu_Off"
-                 image_selected="Toolbar_Left_Selected"
-                 image_unselected="Toolbar_Left_Off"
-                 layout="topleft"
-                 left="5"
-                 name="view_options_btn"
-                 top="5"
-                 width="31" />
-             <button
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="AddItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="4"
-                 name="add_btn"
-                 width="31">
-                 <commit_callback
-                    function="Chats.add" />
-             </button>   
-             <button
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Right_Over"
-                 image_overlay="VoicePTT_Off"
-                 image_selected="Toolbar_Right_Selected"
-                 image_unselected="Toolbar_Right_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="4"
-                 name="voice_call_btn"
-                 width="31">
-                 <commit_callback
-                    function="Chats.add" />
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Icon_Close_Foreground"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left="283"
-                 name="close_btn"
-                 width="31">
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Open_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="5"
-                 name="expand_collapse_btn"
-                 width="31">
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="tearoffbox.tga"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="5"
-                 name="tear_off_btn"
-                 width="31">
-             </button>
-     </panel>
-    <panel
-        top="35"
-        left="0"
-        class="panel_nearby_chat"
-        follow="all"
-        width="390"
-        height="0"
-        visible="false"
-        filename="panel_nearby_chat.xml"
-        name="nearby_chat" />
-    <panel
-    	width="390"
-    	height="10"
-    	visible="true" />
-    <panel width="394" 
-           height="31" 
-           left="0" 
-           name="bottom_panel"
-           bottom="-1" 
-           follows="left|right|bottom" 
-           tab_group="1">
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|right"
-        height="20"
-        label="Click here to chat."
-        layout="topleft"
-        left="1"
-        max_length_bytes="1023"
-        name="chat_box"
-        tool_tip="Press Enter to say, Ctrl+Enter to shout"
-        top="2"
-        width="384" />
-      <output_monitor
-        auto_update="true"
-        follows="right"
-        draw_border="false"
-        height="16"
-        layout="topleft"
-        left_pad="-24"
-        mouse_opaque="true"
-        name="chat_zone_indicator"
-        top="6"
-        visible="true"
-        width="20" />
-      <button
-        follows="right"
-        visible="false"
-        is_toggle="true"
-        width="20"
-        top="2"
-        layout="topleft"
-        left_pad="12"
-        image_disabled="ComboButton_UpOff"
-        image_unselected="ComboButton_UpOff"
-        image_selected="ComboButton_On"
-        image_pressed="ComboButton_UpSelected"
-        image_pressed_selected="ComboButton_Selected"
-        height="23"
-        chrome="true"
-        name="show_nearby_chat"
-        tool_tip="Shows/hides nearby chat log">
-      </button>
-    </panel>
-  </view>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index a332bb5b12..c5cacab9f4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -138,18 +138,24 @@
   top_pad="0"
   left="0">
     <layout_panel
-      name="im_control_panel_holder"
+      name="speakers_list_panel"
       min_width="115"
       width="150" 
       height="310" 
       auto_resize="false">
-      <panel
-        name="panel_im_control_panel"
-        layout="topleft"
-        height="310"
-        width="150" 
-        follows="all"/>
-      </layout_panel>
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="100"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="true"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="145" />
+    </layout_panel>
     <layout_panel
        default_tab_group="3"
        left="0"
@@ -158,27 +164,82 @@
        height="200"
 	    width="254"
        user_resize="true">
-        <chat_history
-	     font="SansSerifSmall"
-         follows="all"
-         height="170"
-         name="chat_history"
-         parse_highlights="true"
-         parse_urls="true"
-         left="1"
-         width="249">
-        </chat_history>
-        <line_editor
-         bottom="0"
-         follows="left|right|bottom"
-	     font="SansSerifSmall"
-         height="20"
-         label="To"
-         layout="bottomleft"
-         name="chat_editor"
-         tab_group="3"
-         width="249">
-        </line_editor>
+         <layout_stack
+          animate="true" 
+          default_tab_group="2"
+          follows="all"
+          height="200"
+          width="254"
+          layout="topleft"
+          orientation="vertical"
+          name="chat_area"
+          tab_group="1"
+          left_pad="0"
+          top="0">
+            <layout_panel
+             auto_resize="false"
+             height="26"
+             layout="topleft"
+             left_delta="0"
+             name="translate_chat_checkbox_lp"
+             top_delta="0"
+             visible="true"
+             width="230">
+                <check_box
+                 top="10"
+                 control_name="TranslateChat"
+                 enabled="true"
+                 height="16"
+                 label="Translate chat"
+                 layout="topleft"
+                 left="5"
+                 name="translate_chat_checkbox"
+                 width="230" />
+            </layout_panel>
+            <layout_panel
+             auto_resize="false"
+             height="170"
+             layout="topleft"
+             left_delta="0"
+             name="translate_chat_checkbox_lp"
+             top_delta="0"
+             visible="true"
+             width="230">      
+           		<chat_history
+    	     		font="SansSerifSmall"
+             		follows="all"
+             		height="170"
+            	 	name="chat_history"
+             		parse_highlights="true"
+             		parse_urls="true"
+             		left="1"
+             		width="229">
+            	</chat_history>
+            	<line_editor
+             		bottom="0"
+             		follows="left|right|bottom"
+	         		font="SansSerifSmall"
+             		height="20"
+             		label="To"
+             		layout="bottomleft"
+             		name="chat_editor"
+             		tab_group="3"
+             		width="230">
+            	</line_editor>
+            	<output_monitor
+                 auto_update="true"
+                 follows="right"
+                 draw_border="false"
+                 height="16"
+                 layout="topleft"
+                 left_pad="-24"
+                 mouse_opaque="true"
+                 name="chat_zone_indicator"
+                 top="6"
+                 visible="true"
+                 width="20" />           	
+            </layout_panel>
+        </layout_stack>
     </layout_panel>
   </layout_stack>
     </view>
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
deleted file mode 100644
index d68fa6ca6c..0000000000
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="215"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="215"
-     layout="topleft"
-     left="3"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="147">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="130"
-         layout="topleft"
-         left="0"
-         min_height="0"
-         mouse_opaque="false"
-         width="147"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="130"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="147" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Call"
-             name="call_btn"
-             width="130"
-             top="0" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Leave Call"
-             name="end_call_btn"
-             top="0"/>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             top="0"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
deleted file mode 100644
index a5295ebe01..0000000000
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="238"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="238"
-     layout="topleft"
-     left="5"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="145">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="100"
-         layout="topleft"
-         min_height="0"
-         mouse_opaque="false"
-         width="145"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="100"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="145" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Open Voice Controls"
-             name="voice_ctrls_btn"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index b415ba780d..4de56b424e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -6,16 +6,17 @@
  help_topic="nearby_chat"
  layout="topleft"
  name="nearby_chat"
- width="394">
+ width="242"
+ height="169">
   <layout_stack
    follows="all"
-   height="278"
+   height="164"
    layout="topleft"
    left="0"
    name="stack"
    top="5"
    orientation="vertical"
-   width="394">
+   width="242">
     <layout_panel
      auto_resize="false"
      height="26"
@@ -24,7 +25,7 @@
      name="translate_chat_checkbox_lp"
      top_delta="0"
      visible="true"
-     width="387">
+     width="230">
       <check_box
        top="10"
        control_name="TranslateChat"
@@ -34,15 +35,15 @@
        layout="topleft"
        left="5"
        name="translate_chat_checkbox"
-       width="374" />
+       width="230" />
     </layout_panel>
     <layout_panel
      auto_resize="true"
-     height="256"
+     height="138"
      left_delta="0"
      layout="topleft"
      name="chat_history_lp"
-     width="394">
+     width="242">
       <chat_history
        bg_readonly_color="ChatHistoryBgColor"
        bg_writeable_color="ChatHistoryBgColor"
@@ -50,7 +51,7 @@
        layout="topleft"
        left="5"
        left_widget_pad="0"
-       height="240"
+       height="138"
        name="chat_history"
        parse_highlights="true"
        parse_urls="true"
@@ -58,7 +59,7 @@
        text_color="ChatHistoryTextColor"
        text_readonly_color="ChatHistoryTextColor"
        top="0"
-       width="384" />
+       width="237" />
     </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3


From b7b612500132acf05e82f1482460ffa9312fcc4a Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 1 Jun 2012 14:57:51 +0300
Subject: CHUI-119 FIXED Bug fixed. Clean up a code

---
 .../skins/default/xui/en/floater_im_session.xml    | 88 +++++++++++++---------
 1 file changed, 53 insertions(+), 35 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index c5cacab9f4..beeb4eea9b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -70,8 +70,6 @@
                  left_pad="4"
                  name="add_btn"
                  width="31">
-                 <commit_callback
-                    function="Chats.add" />
              </button>   
              <button
                  follows="top|left"
@@ -85,8 +83,6 @@
                  left_pad="4"
                  name="voice_call_btn"
                  width="31">
-                 <commit_callback
-                    function="Chats.add" />
              </button>
              <button
                  follows="right|top"
@@ -136,9 +132,12 @@
   name="im_panels"
   tab_group="1"
   top_pad="0"
-  left="0">
+  left="0"
+  auto_resize="true"
+  user_resize="true">
     <layout_panel
       name="speakers_list_panel"
+      follows="all"
       min_width="115"
       width="150" 
       height="310" 
@@ -146,7 +145,7 @@
             <avatar_list
              color="DkGray2"
              follows="all"
-             height="100"
+             height="310"
              ignore_online_status="true"
              layout="topleft"
              name="speakers_list"
@@ -154,28 +153,44 @@
              show_info_btn="true"
              show_profile_btn="false"
              show_speaking_indicator="false"
-             width="145" />
+             width="150" />
     </layout_panel>
     <layout_panel
        default_tab_group="3"
        left="0"
        tab_group="2"
+       follows="all"
        top="0"
-       height="200"
-	    width="254"
-       user_resize="true">
+       height="310"
+	   width="244"
+       layout="topleft"
+       user_resize="true"
+       auto_resize="true"
+       visible="true"
+       name="left_part_holder">
+        <panel
+         name="trnsAndChat_panel"
+         follows="all"
+         layout="topleft"
+         visible="true"
+         height="275"
+         width="244">
          <layout_stack
           animate="true" 
           default_tab_group="2"
           follows="all"
-          height="200"
-          width="254"
+          height="275"
+          width="244"
           layout="topleft"
+          visible="true"
           orientation="vertical"
-          name="chat_area"
+          name="translate_and_chat_stack"
           tab_group="1"
+          auto_resize="true"
+          user_resize="true"
           left_pad="0"
-          top="0">
+          top="0"
+          left="0">
             <layout_panel
              auto_resize="false"
              height="26"
@@ -197,49 +212,52 @@
                  width="230" />
             </layout_panel>
             <layout_panel
-             auto_resize="false"
-             height="170"
+             height="248"
+             width="234"
              layout="topleft"
+             follows="all"
              left_delta="0"
-             name="translate_chat_checkbox_lp"
              top_delta="0"
+             bottom="0"
              visible="true"
-             width="230">      
+             user_resize="true"
+             auto_resize="true"
+             name="chat_holder">      
            		<chat_history
     	     		font="SansSerifSmall"
              		follows="all"
-             		height="170"
+             		visible="true"
+             		height="240"
             	 	name="chat_history"
              		parse_highlights="true"
              		parse_urls="true"
              		left="1"
              		width="229">
-            	</chat_history>
+            	</chat_history>           
+            </layout_panel>
+           </layout_stack>
+           </panel>
+            <panel width="228" 
+             height="31" 
+             left="4"
+             right="4" 
+             name="bottom_panel"
+             bottom="-1" 
+             follows="left|right|bottom" 
+             tab_group="1">    
             	<line_editor
              		bottom="0"
              		follows="left|right|bottom"
 	         		font="SansSerifSmall"
+	         		visible="true"
              		height="20"
              		label="To"
              		layout="bottomleft"
              		name="chat_editor"
              		tab_group="3"
-             		width="230">
+             		width="240">
             	</line_editor>
-            	<output_monitor
-                 auto_update="true"
-                 follows="right"
-                 draw_border="false"
-                 height="16"
-                 layout="topleft"
-                 left_pad="-24"
-                 mouse_opaque="true"
-                 name="chat_zone_indicator"
-                 top="6"
-                 visible="true"
-                 width="20" />           	
-            </layout_panel>
-        </layout_stack>
+              </panel>
     </layout_panel>
   </layout_stack>
     </view>
-- 
cgit v1.2.3


From d11f542ffefdc5db845028d5a260b5b0ad12dea6 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 7 Jun 2012 00:59:05 +0300
Subject: CHUI-120 WIP Added starting ad hoc conference in the same floater as
 P2P chat, after adding more participants. - Added a parameter to
 LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid
 of a P2P IM floater which should be used to start a new conference in it. -
 In LLChicletBar::sessionRemoved() we don't close the IM floater if it is
 going to be re-used for a new conference.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index beeb4eea9b..fc5b6b10af 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -69,8 +69,7 @@
                  top="5"
                  left_pad="4"
                  name="add_btn"
-                 width="31">
-             </button>   
+                 width="31"/>
              <button
                  follows="top|left"
                  height="25"
@@ -82,8 +81,7 @@
                  top="5"
                  left_pad="4"
                  name="voice_call_btn"
-                 width="31">
-             </button>
+                 width="31"/>
              <button
                  follows="right|top"
                  height="25"
-- 
cgit v1.2.3


From f7f85dd0dda563a9fb49ed65b193a9ea98da9ba2 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 8 Jun 2012 01:09:00 +0300
Subject: CHUI-122 FIX Add button enabled only for P2P and ad hoc IM sessions.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index fc5b6b10af..21fc2d25d4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -59,6 +59,7 @@
                  top="5"
                  width="31" />
              <button
+                 enabled="false"
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-- 
cgit v1.2.3


From ec726c3a3ecbefd34008cd735f455c7947b67246 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 11 Jun 2012 17:04:58 +0300
Subject: CHUI-119 WIP Fixed some bugs

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 21fc2d25d4..e5e005e36f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -236,10 +236,9 @@
             </layout_panel>
            </layout_stack>
            </panel>
-            <panel width="228" 
+            <panel width="225" 
              height="31" 
-             left="4"
-             right="4" 
+             left="4" 
              name="bottom_panel"
              bottom="-1" 
              follows="left|right|bottom" 
@@ -254,7 +253,7 @@
              		layout="bottomleft"
              		name="chat_editor"
              		tab_group="3"
-             		width="240">
+             		width="220">
             	</line_editor>
               </panel>
     </layout_panel>
-- 
cgit v1.2.3


From 9993fa550ab3716e583a6d5699f27974c3a95eb9 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 12 Jun 2012 21:56:00 +0300
Subject: CHUI-119 WIP Suppressed of the warnings (XML corrected); fixed the
 torn-off button's states

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index e5e005e36f..a4695b8c09 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -15,6 +15,9 @@
  can_tear_off="false"
  min_width="250"
  min_height="190">
+    <floater.string 
+     name="NearbyChatTitle"
+     value="Nearby Chat"/>
     <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
     <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
     <floater.string
@@ -131,9 +134,7 @@
   name="im_panels"
   tab_group="1"
   top_pad="0"
-  left="0"
-  auto_resize="true"
-  user_resize="true">
+  left="0">
     <layout_panel
       name="speakers_list_panel"
       follows="all"
@@ -185,8 +186,6 @@
           orientation="vertical"
           name="translate_and_chat_stack"
           tab_group="1"
-          auto_resize="true"
-          user_resize="true"
           left_pad="0"
           top="0"
           left="0">
-- 
cgit v1.2.3


From c238027dd9917b1633ff5f16911fbdbe437f9a55 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 14 Jun 2012 16:47:43 -0700
Subject: CHUI-139 : Use the Chat toolbar button to open and close the
 conversations multi floater. Force Nearby Conversation if floater is empty.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0a2fc13aff..7790a382d9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3692,6 +3692,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Avatar_Label">Avatar</string>
   <string name="Command_Build_Label">Build</string>
   <string name="Command_Chat_Label">Chat</string>
+  <string name="Command_Conversations_Label">Conversations</string>
   <string name="Command_Compass_Label">Compass</string>
   <string name="Command_Destinations_Label">Destinations</string>
   <string name="Command_Gestures_Label">Gestures</string>
@@ -3718,6 +3719,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
   <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string>
   <string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
+  <string name="Command_Conversations_Tooltip">Converse with everyone</string>
   <string name="Command_Compass_Tooltip">Compass</string>
   <string name="Command_Destinations_Tooltip">Destinations of interest</string>
   <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
-- 
cgit v1.2.3


From 18aabdfd3d2efc1b5507e2fe001cfc36ee84b710 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 19 Jun 2012 09:44:40 +0300
Subject: CHUI-127 FIXED (Make chat field auto resizable)

- Replaced LLLineEditor with newly created LLChatEntry
- Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes
---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 9 ++++++---
 indra/newview/skins/default/xui/en/widgets/text.xml       | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index a4695b8c09..f6d5b20a65 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -242,18 +242,21 @@
              bottom="-1" 
              follows="left|right|bottom" 
              tab_group="1">    
-            	<line_editor
+            	<text_editor
              		bottom="0"
+             		expand_lines_count="5"
              		follows="left|right|bottom"
 	         		font="SansSerifSmall"
 	         		visible="true"
              		height="20"
+             		is_expandable="true"
              		label="To"
              		layout="bottomleft"
              		name="chat_editor"
              		tab_group="3"
-             		width="220">
-            	</line_editor>
+             		width="240"
+             		wrap="true">
+            	</text_editor>
               </panel>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 134f2d7522..2102074674 100644
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -9,6 +9,7 @@
       h_pad="0" 
       allow_scroll="false"
       text_readonly_color="LabelTextColor"
+      text_tentative_color="TextFgTentativeColor"
       bg_writeable_color="FloaterDefaultBackgroundColor" 
       use_ellipses="false"
       bg_visible="false" 
-- 
cgit v1.2.3


From c8857cc72270479ed3a5a04b14be3361b2eafea9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 19 Jun 2012 19:25:58 -0700
Subject: CHUI-142 : Changes to chat related preferences

---
 .../default/xui/en/panel_preferences_chat.xml      | 58 ----------------------
 1 file changed, 58 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index caf7fc85f5..d7a7f7d735 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -75,15 +75,6 @@
      name="send_im_to_email"
      top_pad="5"
      width="400" />
-    <check_box
-     enabled="false"
-     height="16"
-     label="Enable plain text IM and chat history"
-     layout="topleft"
-     left_delta="0"
-     name="plain_text_chat_history"
-     top_pad="5"
-     width="400" />
     <check_box
      control_name="UseChatBubbles"
      follows="left|top"
@@ -94,55 +85,6 @@
      top_pad="5"
      name="bubble_text_chat"
      width="150" />     
-    <text
-     name="show_ims_in_label"
-     follows="left|top"
-     layout="topleft"
-     left="30"
-     height="20"
-     width="170"
-     top_pad="15">
-     Show IMs in:
-    </text>
-    <text
-     name="requires_restart_label"
-     follows="left|top"
-     layout="topleft"
-     top_delta="0" 
-     left="170" 
-  	 height="20"
-	 width="130"
-     text_color="White_25">
-      (requires restart)
-      </text>
-    <radio_group
-     follows="left|top"
-     height="30"
-     left="40"
-     control_name="ChatWindow"
-     name="chat_window"
-     top_pad="0"
-     tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
-     width="150">
-     <radio_item
-      height="16"
-      label="Separate Windows"
-      layout="topleft"
-      left="0"
-      name="radio"
-      value="0"
-      top="0"
-      width="150" />
-     <radio_item
-      height="16"
-      label="Tabs"
-      layout="topleft"
-      left_delta="0"
-      name="radio2"
-      value="1"
-      top_pad="5"
-      width="150" />
-    </radio_group>
     <text
      name="disable_toast_label"
      follows="left|top"
-- 
cgit v1.2.3


From 91be3bf3019581b74a3515c1081aef883c0658fa Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 22 Jun 2012 16:56:33 +0300
Subject: CHUI-161 FIXED (Text entered in local chat is not visible to other
 users nearby)

- Applied Merov's fix.
The problem was that text_editor was registered twice and, depending of the machine you ran, the viewer would pick one or the other.
Mac users were unlucky enough to pick the wrong one all the time.
---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index f6d5b20a65..0720a4b011 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -242,7 +242,7 @@
              bottom="-1" 
              follows="left|right|bottom" 
              tab_group="1">    
-            	<text_editor
+            	<chat_editor
              		bottom="0"
              		expand_lines_count="5"
              		follows="left|right|bottom"
@@ -256,7 +256,7 @@
              		tab_group="3"
              		width="240"
              		wrap="true">
-            	</text_editor>
+            	</chat_editor>
               </panel>
     </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3


From 3807f97facc79960c579793376412a0baf6b9de3 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 22 Jun 2012 18:13:34 +0300
Subject: CHUI-136 FIXED (Implement new design for blocked list on the people
 floater)

- Created new LLBlockList class and replaced LLScrollContainer with it
- Also created new LLBlockedListItem class which represents blocked objects and blocked avatars
---
 .../default/xui/en/menu_people_blocked_gear.xml    |  26 ++++
 .../default/xui/en/menu_people_blocked_plus.xml    |  20 +++
 .../default/xui/en/menu_people_blocked_view.xml    |  26 ++++
 .../default/xui/en/panel_block_list_sidetray.xml   | 160 +++++++++++----------
 .../default/xui/en/panel_blocked_list_item.xml     |  62 ++++++++
 .../newview/skins/default/xui/en/panel_people.xml  |   1 +
 6 files changed, 217 insertions(+), 78 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_blocked_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..63295ea27b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_gear"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Unblock"
+   name="unblock">
+      <on_click
+       function="Block.Action"
+       parameter="unblock_item" />
+      <on_enable
+       function="Block.Enable"
+       parameter="unblock_item" /> 
+  </menu_item_call>
+  <menu_item_call
+   label="Profile..."
+   name="profile">
+      <on_click
+       function="Block.Action"
+       parameter="profile_item"/>
+      <on_enable
+       function="Block.Enable"
+       parameter="profile_item" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..0c7155667e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Block Resident by name..."
+   name="block_resident_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="block_res_by_name"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Block object by name"
+   name="block_object_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="block_obj_by_name"/>
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..2efb70ee37
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_view"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by name"
+   name="sort_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="sort_by_name"/>
+      <on_check
+       function="Block.Check"
+       parameter="sort_by_name"/>
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by type"
+   name="sort_by_type">
+      <on_click
+       function="Block.Action"
+       parameter="sort_by_type" />
+      <on_check
+       function="Block.Check"
+       parameter="sort_by_type" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 3577d2f457..f466504938 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -5,90 +5,94 @@
  height="305"
  layout="topleft"
  left="0"
- right="-1"
  name="block_list_panel"
  help_topic="blocked_list"
  min_height="350"
  min_width="240"
- width="280">
-        <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back"
-     left="4"
-     tab_stop="false"
-     top="1"
-     width="30"/>
-    <text
-     follows="top|left|right"
-     font="SansSerifLargeBold"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="title_text"
-     text_color="white"
-     top="5"
-     width="250">
-        Block List
-     </text>
-    <scroll_list
+ width="323">
+     <panel
+      follows="left|top|right"
+      height="27"
+      label="bottom_panel"
+      layout="topleft"
+      left="0"
+      name="blocked_buttons_panel"
+      right="-1"
+      top="0">
+         <filter_editor
+          follows="left|top|right"
+          height="23"
+          layout="topleft"
+          left="6"
+          label="Filter"
+          max_length_chars="300"
+          name="blocked_filter_input"
+          text_color="Black"
+          text_pad_left="10"
+          top="4"
+          width="177" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="OptionsMenu_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="8"
+          menu_filename="menu_people_blocked_gear.xml"
+          menu_position="bottomleft"
+          name="blocked_gear_btn"
+          top="3"
+          width="31" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="Inv_Underpants"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          menu_filename="menu_people_blocked_view.xml"
+          menu_position="bottomleft"
+          name="view_btn"
+          top_delta="0"
+          width="31" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="AddItem_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          menu_filename="menu_people_blocked_plus.xml"
+          menu_position="bottomleft"
+          name="plus_btn"
+          top_delta="0"
+          width="31"/>
+          <button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="TrashItem_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          left_pad="2"
+          layout="topleft"
+          name="unblock_btn"
+          top_delta="0"
+          width="31"/>
+     </panel>
+    <block_list
      follows="all"
-     height="190"
+     height="273"
      layout="topleft"
-     left="5"
+     left="3"
      name="blocked"
      tool_tip="List of currently blocked Residents"
-     top="30"
-  	 right="-1"
-     width="270">
-        <scroll_list.columns
-         name="item_name" />
-        <scroll_list.columns
-         name="item_type"
-         width="96" />
-    </scroll_list>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Block person"
-     layout="topleft"
-     left_delta="0"
-     name="Block resident..."
-     tool_tip="Pick a Resident to block"
-     top_pad="4"
-     width="210">
-        <button.commit_callback
-         function="Block.ClickPick" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Block object by name"
-     layout="topleft"
-     left_delta="0"
-     name="Block object by name..."
-     tool_tip="Pick an object to block by name"
-     top_pad="4"
-     width="210" >
-        <button.commit_callback
-         function="Block.ClickBlockByName" />
-    </button>
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="23"
-     label="Unblock"
-     layout="topleft"
-     left_delta="0"
-     name="Unblock"
-     tool_tip="Remove Resident or object from blocked list"
-     top_pad="4"
-     width="210" >
-        <button.commit_callback
-         function="Block.ClickRemove" />
-    </button>
+     top="31"
+  	 right="-1"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
new file mode 100644
index 0000000000..a63a14ca69
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="blocked_list_item"
+ top="0"
+ width="380">
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|right|left"
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <avatar_icon
+     default_icon_name="Generic_Person"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="16"
+     image_name="Inv_Object"
+     layout="topleft"
+     left="7"
+     name="object_icon"
+     top="4"
+     visible="false"
+     width="16" />
+    <text
+     follows="left|right"
+     font="SansSerifSmall"
+     font.color="DkGray"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="item_name"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="180" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ceb03d03a9..38a996547c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -611,6 +611,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            filename="panel_block_list_sidetray.xml"
            follows="all"
            label="Blocked Residents &amp; Objects"
+           layout="topleft"
            left="0"
            font="SansSerifBold"
            top="0"
-- 
cgit v1.2.3


From afc6a7e6baeb9b568feb31cfd8eb978bb485c0c6 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 22 Jun 2012 20:05:35 +0300
Subject: CHUI-136 ADDITIONAL FIX (Implement new design for blocked list on the
 people floater)

- If mute item type is LLMute::BY_NAME it means that it's an object and we should show corresponding icon
- Also added icon for blocked groups
---
 indra/newview/skins/default/xui/en/panel_blocked_list_item.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
index a63a14ca69..84e7e467b1 100644
--- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -37,6 +37,16 @@
      top="2"
      visible="false"
      width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
     <icon
      follows="top|left"
      height="16"
-- 
cgit v1.2.3


From ad8478c47038c09f016da26669570a571753f397 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 23 Jun 2012 19:28:28 -0400
Subject: STORM-1892 Add Apply button to the edit content permission floater

---
 .../skins/default/xui/en/floater_bulk_perms.xml       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 4e0cfb0cd4..e7ab3cacdc 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -6,7 +6,7 @@
  layout="topleft"
  name="floaterbulkperms"
  help_topic="floaterbulkperms"
- title="EDIT CONTENT PERMISSIONS"
+ title="ADJUST CONTENT PERMISSIONS"
  width="410">
     <floater.string
      name="nothing_to_modify_text">
@@ -192,7 +192,7 @@
      name="newperms"
      top="90"
      width="250">
-        New Content Permissions
+        Adjust Content Permissions To
     </text>
       <text
        type="string"
@@ -292,9 +292,20 @@
      height="23"
      label="OK"
      layout="topleft"
-     left="205"
-     name="apply"
+     left="110"
+     name="ok"
      top_pad="10"
+     width="90">
+      <button.commit_callback
+       function="BulkPermission.Ok"/>
+    </button>
+    <button
+     follows="left|top"
+     height="23"
+     label="Apply"
+     layout="topleft"
+     left_pad="5"
+     name="apply"
      width="90">
       <button.commit_callback
        function="BulkPermission.Apply"/>
-- 
cgit v1.2.3


From 9fc77dec8788944f93eda14567f9235f97637097 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Mon, 25 Jun 2012 15:49:49 +0300
Subject: CHUI-175 FIXED (Cannot use scroll bar on chat entry field when multi
 line chat is added)

- This change also fixes:
        CHUI-176 (Only bottom 2 lines of multi line chat allow for selecting in text chat entry)
        CHUI-177 (Text entry field in chat only accepts 256 characters)
---
 .../skins/default/xui/en/floater_im_session.xml    | 39 +++++++++-------------
 1 file changed, 16 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 0720a4b011..56e591e2bb 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -235,29 +235,22 @@
             </layout_panel>
            </layout_stack>
            </panel>
-            <panel width="225" 
-             height="31" 
-             left="4" 
-             name="bottom_panel"
-             bottom="-1" 
-             follows="left|right|bottom" 
-             tab_group="1">    
-            	<chat_editor
-             		bottom="0"
-             		expand_lines_count="5"
-             		follows="left|right|bottom"
-	         		font="SansSerifSmall"
-	         		visible="true"
-             		height="20"
-             		is_expandable="true"
-             		label="To"
-             		layout="bottomleft"
-             		name="chat_editor"
-             		tab_group="3"
-             		width="240"
-             		wrap="true">
-            	</chat_editor>
-              </panel>
+            <chat_editor
+              bottom="0"
+              expand_lines_count="5"
+              follows="left|right|bottom"
+              font="SansSerifSmall"
+              visible="true"
+              height="20"
+              is_expandable="true"
+              label="To"
+              layout="bottomleft"
+              name="chat_editor"
+              max_length="1024"
+              tab_group="3"
+              width="240"
+              wrap="true">
+            </chat_editor>
     </layout_panel>
   </layout_stack>
     </view>
-- 
cgit v1.2.3


From 75a76491ede4bd0386277e0837ae0804c6edd67e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 25 Jun 2012 14:21:19 -0400
Subject: STORM-1894 UIScaleFactor: raise limit from 1.4 to at least 1.5

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 2cc9d9c1b0..50fd57494f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -138,7 +138,7 @@
    initial_value="1"
    layout="topleft"
    left_pad="0"
-   max_val="1.4"
+   max_val="1.5"
    min_val="0.75"
    name="ui_scale_slider"
    top_pad="-14"
-- 
cgit v1.2.3


From 9c11a6b206f2455e37cf3ba8719bf6b51bc994e8 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 26 Jun 2012 18:58:57 +0300
Subject: CHUI-177 ADDITIONAL FIX (Text entry field in chat only accepts 256
 characters)

- Limited text entry field to 1024 instead of 1025 characters
should take into account zero (0 ... 1023)
---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 56e591e2bb..08bc46a506 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -246,7 +246,7 @@
               label="To"
               layout="bottomleft"
               name="chat_editor"
-              max_length="1024"
+              max_length="1023"
               tab_group="3"
               width="240"
               wrap="true">
-- 
cgit v1.2.3


From abe106bd9c33fef12dcf4eacca228d5d669d9e34 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 26 Jun 2012 19:27:19 +0300
Subject: - CHUI-178 (Right click context menu not present in chat entry field)

- Set parameter to true to show context menu
---
 indra/newview/skins/default/xui/en/widgets/chat_editor.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/chat_editor.xml

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

diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
new file mode 100644
index 0000000000..f9facb593a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<chat_editor
+  name="chat_editor"
+  show_context_menu="true"/>
-- 
cgit v1.2.3


From e8fa07d6384c9eb2a0fb42b0e06abb6a0d5fdea9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 28 Jun 2012 16:47:37 -0700
Subject: CHUI-82 : Fixed all icons to use the new Conv_*.png icons; please use
 those in the new UIs moving forward

---
 .../skins/default/xui/en/floater_im_container.xml  | 10 +++---
 .../skins/default/xui/en/floater_im_session.xml    | 36 +++++++++++-----------
 .../default/xui/en/panel_block_list_sidetray.xml   |  2 +-
 .../newview/skins/default/xui/en/panel_people.xml  |  8 ++---
 4 files changed, 28 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index ce40f44a64..8e434b5848 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -15,10 +15,10 @@
  width="680">
     <string
      name="collapse_icon"
-     value="TabIcon_Open_Off"/>
+     value="Conv_toolbar_collapse"/>
     <string
      name="expand_icon"
-     value="TabIcon_Close_Off"/>
+     value="Conv_toolbar_expand"/>
     <layout_stack
      animate="true" 
      follows="all"
@@ -53,7 +53,7 @@
                      follows="top|left"
                      height="25"
                      image_hover_unselected="Toolbar_Middle_Over"
-                     image_overlay="OptionsMenu_Off"
+                     image_overlay="Conv_toolbar_sort"
                      image_selected="Toolbar_Middle_Selected"
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
@@ -65,7 +65,7 @@
                      follows="top|left"
                      height="25"
                      image_hover_unselected="Toolbar_Middle_Over"
-                     image_overlay="AddItem_Off"
+                     image_overlay="Conv_toolbar_plus"
                      image_selected="Toolbar_Middle_Selected"
                       image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
@@ -84,7 +84,7 @@
                      follows="right|top"
                      height="25"
                      image_hover_unselected="Toolbar_Middle_Over"
-                     image_overlay="TabIcon_Open_Off"
+                     image_overlay="Conv_toolbar_collapse"
                      image_selected="Toolbar_Middle_Selected"
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 08bc46a506..32eb4ebdae 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -18,20 +18,20 @@
     <floater.string 
      name="NearbyChatTitle"
      value="Nearby Chat"/>
-    <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
-    <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
+    <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
+    <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
     <floater.string
      name="collapse_icon"
-     value="TabIcon_Open_Off"/>
+     value="Conv_toolbar_collapse"/>
     <floater.string
      name="expand_icon"
-     value="TabIcon_Close_Off"/>
+     value="Conv_toolbar_expand"/>
     <floater.string
      name="tear_off_icon"
-     value="tearoffbox.tga"/>
+     value="Conv_toolbar_arrow_ne"/>
     <floater.string
      name="return_icon"
-     value="Icon_Dock_Foreground"/>
+     value="Conv_toolbar_arrow_sw"/>
     <view
         follows="all"
         layout="topleft"
@@ -52,10 +52,10 @@
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
                  height="25"
-                 image_hover_unselected="Toolbar_Left_Over"
-                 image_overlay="OptionsMenu_Off"
-                 image_selected="Toolbar_Left_Selected"
-                 image_unselected="Toolbar_Left_Off"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left="5"
                  name="view_options_btn"
@@ -66,7 +66,7 @@
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="AddItem_Off"
+                 image_overlay="Conv_toolbar_add_person"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -77,10 +77,10 @@
              <button
                  follows="top|left"
                  height="25"
-                 image_hover_unselected="Toolbar_Right_Over"
-                 image_overlay="VoicePTT_Off"
-                 image_selected="Toolbar_Right_Selected"
-                 image_unselected="Toolbar_Right_Off"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_open_call"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
                  left_pad="4"
@@ -90,7 +90,7 @@
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Icon_Close_Foreground"
+                 image_overlay="Conv_toolbar_close"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -102,7 +102,7 @@
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Open_Off"
+                 image_overlay="Conv_toolbar_collapse"
                  image_selected="Toolbar_Middle_Selected"
              	 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -114,7 +114,7 @@
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="tearoffbox.tga"
+                 image_overlay="Conv_toolbar_arrow_ne"
                  image_selected="Toolbar_Middle_Selected"
              	 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index f466504938..24f7d44cce 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -49,7 +49,7 @@
           follows="right"
           height="25"
           image_hover_unselected="Toolbar_Middle_Over"
-          image_overlay="Inv_Underpants"
+          image_overlay="Conv_toolbar_sort"
           image_selected="Toolbar_Middle_Selected"
           image_unselected="Toolbar_Middle_Off"
           layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 38a996547c..09156b41b5 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -122,7 +122,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Inv_Underpants"
+                 image_overlay="Conv_toolbar_sort"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -270,7 +270,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Inv_Underpants"
+                 image_overlay="Conv_toolbar_sort"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -425,7 +425,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Inv_Underpants"
+                 image_overlay="Conv_toolbar_sort"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -533,7 +533,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Inv_Underpants"
+                 image_overlay="Conv_toolbar_sort"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-- 
cgit v1.2.3


From 891af8055acc66364e7da009c74a6b6a91ea4663 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Tue, 17 Jul 2012 13:52:08 -0700
Subject: MAINT-1276: Add ability to paste LSL tooltips into scripts.  Reviewed
 by Kelly

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index f6a8af0973..765b07ed8b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -158,6 +158,7 @@
      text_readonly_color="DkGray"
      width="487"
      show_line_numbers="true" 
+     enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
     </text_editor>
-- 
cgit v1.2.3


From 62379fd7628afa5ce1b104ff66b26821ce740c29 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Tue, 31 Jul 2012 10:37:50 -0700
Subject: MAINT-1305 llDialog tooltip typo

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 866ea296c3..1d5163e725 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1446,7 +1446,7 @@ integer llScriptDanger(vector pos)
 Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
 	</string>
 	<string name="LSLTipText_llDialog" translate="false">
-llDialog(key avatar, string message, list buttons, integer chat_channel
+llDialog(key avatar, string message, list buttons, integer chat_channel)
 Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
 If a button is pressed, the avatar says the text of the button label on chat_channel.
 	</string>
-- 
cgit v1.2.3


From 6dff1477d5898c54ea0a08aa72bd099b628433e7 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 12 Jul 2012 16:36:01 +0300
Subject: CHUI-199 FIXED Save positioning of conversations between sessions

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 32eb4ebdae..95f6708e96 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -9,6 +9,7 @@
  can_dock="false"
  can_minimize="true"
  can_close="true"
+ save_rect="true"
  visible="false"
  width="394"
  can_resize="true"
-- 
cgit v1.2.3


From 6227a5c273efbe732c8068400d7e4b5486981bba Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 19 Jul 2012 19:16:36 +0300
Subject: CHUI-231, CHUI-233 [FIXED] - Modified and simplified algorithm of
 reshaping floater's body (content)  and showing/hiding of the title for
 prevent of present and future issues with floater's repositioning

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 95f6708e96..560e1be213 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -9,7 +9,7 @@
  can_dock="false"
  can_minimize="true"
  can_close="true"
- save_rect="true"
+ save_rect="false"
  visible="false"
  width="394"
  can_resize="true"
-- 
cgit v1.2.3


From de8cd534b985450f6d9ff9d2ad947a2a110f76a8 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 25 Jul 2012 16:16:06 +0300
Subject: CHUI-230 [FIXED] Torn off conversation window size resizes when
 viewer window is resized

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 560e1be213..95f6708e96 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -9,7 +9,7 @@
  can_dock="false"
  can_minimize="true"
  can_close="true"
- save_rect="false"
+ save_rect="true"
  visible="false"
  width="394"
  can_resize="true"
-- 
cgit v1.2.3


From 1e65ba1f909604b027cb7dee5631f698a9f550a8 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 26 Jul 2012 18:57:54 -0700
Subject: CHUI-251: Adding back in the root 'Contents' folder under the Build
 floater Content tab.

---
 indra/newview/skins/default/xui/en/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7790a382d9..fff892af68 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2447,9 +2447,6 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="GroupMoneyDebits">Debits</string>
 	<string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string>
 
-	<!-- viewer object -->
-	<string name="ViewerObjectContents">Contents</string>
-
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">Acquired Items</string>
 	<string name="Cancel">Cancel</string>
-- 
cgit v1.2.3


From f82d0b171964a0b24ab0eca64febc0c1e3821138 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 27 Jul 2012 17:51:40 +0300
Subject: CHUI-204 FIXED (Conversations panel can be re-sized too small with
 all conversations torn off)

- Increased min width of conversations panel by 10 pixels
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 8e434b5848..e5ef80e352 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -33,7 +33,7 @@
          auto_resize="true"
          height="430"
          name="conversations_layout_panel"
-         min_dim="41"
+         min_dim="51"
          width="268">
             <layout_stack
              animate="false" 
-- 
cgit v1.2.3


From 0ee0a5eff41a3763b1fc3fc45a36f87fc6eedac5 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 27 Jul 2012 22:25:17 +0300
Subject: CHUI-151 FIXED (Implement conversation log)

A brief explanation of what have been implemented. More information can be found in comments.

1. Created conversation history viewer (llfloaterconversationpreview)
2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog)
3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively
4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
---
 .../default/xui/en/floater_conversation_log.xml    |  84 +++++++++++++
 .../xui/en/floater_conversation_preview.xml        |  53 ++++++++
 .../skins/default/xui/en/floater_im_container.xml  |   1 +
 .../default/xui/en/menu_conversation_log_gear.xml  | 134 +++++++++++++++++++++
 .../default/xui/en/menu_conversation_log_view.xml  |  37 ++++++
 .../skins/default/xui/en/menu_participant_view.xml |  16 +++
 .../xui/en/panel_conversation_log_list_item.xml    | 108 +++++++++++++++++
 7 files changed, 433 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
new file mode 100644
index 0000000000..1c5800e25f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  can_resize="true"
+  positioning="cascading"
+  height="400"
+  min_height="100"
+  min_width="390"
+  layout="topleft"
+  name="floater_conversation_log"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="CONVERSATION LOG"
+  width="450">
+	<panel
+      follows="left|top|right"
+      height="27"
+      layout="topleft"
+      left="0"
+      name="buttons_panel"
+      top="0">
+        <filter_editor
+          follows="left|top|right"
+          height="23"
+          layout="topleft"
+          left="8"
+          label="Filter People"
+          max_length_chars="300"
+          name="people_filter_input"
+          text_color="Black"
+          text_pad_left="10"
+          top="4"
+          width="364" />
+        <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="Conv_toolbar_sort"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="5"
+          menu_filename="menu_conversation_log_view.xml"
+          menu_position="bottomleft"
+          name="conversation_view_btn"
+          top="3"
+          width="31" />
+        <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="OptionsMenu_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          name="conversations_gear_btn"
+          top="3"
+          width="31" />
+    </panel>
+    <panel
+      follows="all"
+      height="370"
+      layout="topleft"
+      left="5"
+      name="buttons_panel"
+      right="-5"
+      top_pad="5">
+    <conversation_log_list
+      opaque="true"
+      allow_select="true"
+      follows="all"
+      height="360"
+      layout="topleft"
+      left="3"
+      keep_selection_visible_on_reshape="true"
+      item_pad="2"
+      multi_select="false"
+      name="conversation_log_list"
+      right="-3"
+      top="5" />
+    </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
new file mode 100644
index 0000000000..27b744aefb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ height="361"
+ layout="topleft"
+ min_height="243"
+ min_width="234"
+ name="preview_conversation"
+ title="CONVERSATION:"
+ width="400">
+    <floater.string
+     name="Title">
+        CONVERSATION: [NAME]
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left="10"
+     name="desc txt"
+     top="22"
+     width="90">
+        Description:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     enabled="false"
+     follows="left|top|right"
+     font="SansSerif"
+     height="22"
+     layout="topleft"
+     left_pad="0"
+     max_length_bytes="127"
+     name="description"
+     width="296" />
+    <chat_history
+     font="SansSerifSmall"
+     follows="all"
+     visible="true"
+     height="310"
+     name="chat_history"
+     parse_highlights="true"
+     parse_urls="true"
+     left="5"
+     width="390">
+    </chat_history>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e5ef80e352..e8ef3c1df9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -56,6 +56,7 @@
                      image_overlay="Conv_toolbar_sort"
                      image_selected="Toolbar_Middle_Selected"
                      image_unselected="Toolbar_Middle_Off"
+                     menu_filename="menu_participant_view.xml"
                      layout="topleft"
                      left="10"
                      name="sort_btn"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..b8d0eef956
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Context Menu">
+    <menu_item_call
+     label="IM..."
+     layout="topleft"
+     name="IM">
+        <on_click
+         function="Calllog.Action"
+         parameter="im" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call..."
+     layout="topleft"
+     name="Call">
+        <on_click
+         function="Calllog.Action"
+         parameter="call" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_call" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open chat history..."
+     layout="topleft"
+     name="Chat history">
+        <on_click
+         function="Calllog.Action"
+         parameter="chat_history" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_view_chat_history" />
+    </menu_item_call>
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <on_click
+         function="Calllog.Action"
+         parameter="view_profile" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_view_profile" />
+    </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <on_click
+       function="Calllog.Action"
+       parameter="offer_teleport"/>
+      <on_enable
+      function="Calllog.Enable"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_check
+     label="Add friend/Remove friend"
+     layout="topleft"
+     name="Friend_add_remove">
+        <menu_item_check.on_click
+         function="Calllog.Action"
+         parameter="add_rem_friend" />
+        <menu_item_check.on_check
+         function="Calllog.Check"
+         parameter="is_friend" />
+        <menu_item_check.on_enable
+         function="Calllog.Enable"
+         parameter="add_rem_friend" />
+    </menu_item_check>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="Invite">
+        <on_click
+         function="Calllog.Action"
+         parameter="invite_to_group"/>
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_invite_to_group" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="Map">
+        <on_click
+         function="Calllog.Action"
+         parameter="show_on_map" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <on_click
+         function="Calllog.Action"
+         parameter="share" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <on_click
+         function="Calllog.Action"
+         parameter="pay" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block/Unblock"
+     layout="topleft"
+     name="Block/Unblock">
+        <menu_item_check.on_click
+         function="Calllog.Action"
+         parameter="block"/>
+        <menu_item_check.on_check
+         function="Calllog.Check"
+         parameter="is_blocked" />
+        <menu_item_check.on_enable
+         function="Calllog.Enable"
+         parameter="can_block" />
+    </menu_item_check>
+
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..4ab8cb4f7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_conversation_view"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by name"
+   name="sort_by_name">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_by_name"/>
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_by_name"/>
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by date"
+   name="sort_by_date">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_by_date" />
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_by_date" />
+  </menu_item_check>
+  <menu_item_separator />
+  <menu_item_check
+   label="Sort friends on top"
+   name="sort_by_friends">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_friends_on_top" />
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_friends_on_top" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
new file mode 100644
index 0000000000..6401b0e3b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="participant_manu_view">
+    <menu_item_check
+         label="Open conversation log"
+         name="Conversation"
+         visible="true">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="conversation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="conversation" />
+      </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..3c98e32e7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="conversation_log_list_item"
+ top="0"
+ width="380">
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|right|left"
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     default_icon_name="voice_session_icon"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     image_name="Audio_Press"
+     mouse_opaque="true"
+     name="voice_session_icon"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     default_icon_name="incoming_unread_im_icon"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     image_name="Movement_Backward_Off"
+     mouse_opaque="false"
+     name="unread_ims_icon"
+     top="2"
+     visible="false"
+     width="20" />
+    <avatar_icon
+     default_icon_name="Generic_Person"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <text
+     follows="left|right"
+     font="SansSerifSmall"
+     font.color="DkGray"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="conversation_name"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="180" />
+    <text
+     follows="right"
+     font="SansSerifSmall"
+     font.color="DkGray"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="date_time"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="110"/>
+    <button
+     name="delete_btn"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Toast_CloseBtn"
+     image_selected="Toast_CloseBtn"
+     top="5"
+     left_pad="0"
+     height="14"
+     width="14"
+     tab_stop="false"/>
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From e9c436e00e36710228a7d8856d18e116c0b17503 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 27 Jul 2012 13:43:38 -0700
Subject: fixed line endings

---
 .../default/xui/en/floater_conversation_log.xml    | 168 ++++++++++-----------
 1 file changed, 84 insertions(+), 84 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 1c5800e25f..9cdeb0d788 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<floater
-  can_resize="true"
-  positioning="cascading"
-  height="400"
-  min_height="100"
-  min_width="390"
-  layout="topleft"
-  name="floater_conversation_log"
-  save_rect="true"
-  single_instance="true"
-  reuse_instance="true"
-  title="CONVERSATION LOG"
-  width="450">
-	<panel
-      follows="left|top|right"
-      height="27"
-      layout="topleft"
-      left="0"
-      name="buttons_panel"
-      top="0">
-        <filter_editor
-          follows="left|top|right"
-          height="23"
-          layout="topleft"
-          left="8"
-          label="Filter People"
-          max_length_chars="300"
-          name="people_filter_input"
-          text_color="Black"
-          text_pad_left="10"
-          top="4"
-          width="364" />
-        <menu_button
-          follows="right"
-          height="25"
-          image_hover_unselected="Toolbar_Middle_Over"
-          image_overlay="Conv_toolbar_sort"
-          image_selected="Toolbar_Middle_Selected"
-          image_unselected="Toolbar_Middle_Off"
-          layout="topleft"
-          left_pad="5"
-          menu_filename="menu_conversation_log_view.xml"
-          menu_position="bottomleft"
-          name="conversation_view_btn"
-          top="3"
-          width="31" />
-        <menu_button
-          follows="right"
-          height="25"
-          image_hover_unselected="Toolbar_Middle_Over"
-          image_overlay="OptionsMenu_Off"
-          image_selected="Toolbar_Middle_Selected"
-          image_unselected="Toolbar_Middle_Off"
-          layout="topleft"
-          left_pad="2"
-          name="conversations_gear_btn"
-          top="3"
-          width="31" />
-    </panel>
-    <panel
-      follows="all"
-      height="370"
-      layout="topleft"
-      left="5"
-      name="buttons_panel"
-      right="-5"
-      top_pad="5">
-    <conversation_log_list
-      opaque="true"
-      allow_select="true"
-      follows="all"
-      height="360"
-      layout="topleft"
-      left="3"
-      keep_selection_visible_on_reshape="true"
-      item_pad="2"
-      multi_select="false"
-      name="conversation_log_list"
-      right="-3"
-      top="5" />
-    </panel>
-</floater>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  can_resize="true"
+  positioning="cascading"
+  height="400"
+  min_height="100"
+  min_width="390"
+  layout="topleft"
+  name="floater_conversation_log"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="CONVERSATION LOG"
+  width="450">
+	<panel
+      follows="left|top|right"
+      height="27"
+      layout="topleft"
+      left="0"
+      name="buttons_panel"
+      top="0">
+        <filter_editor
+          follows="left|top|right"
+          height="23"
+          layout="topleft"
+          left="8"
+          label="Filter People"
+          max_length_chars="300"
+          name="people_filter_input"
+          text_color="Black"
+          text_pad_left="10"
+          top="4"
+          width="364" />
+        <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="Conv_toolbar_sort"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="5"
+          menu_filename="menu_conversation_log_view.xml"
+          menu_position="bottomleft"
+          name="conversation_view_btn"
+          top="3"
+          width="31" />
+        <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="OptionsMenu_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          name="conversations_gear_btn"
+          top="3"
+          width="31" />
+    </panel>
+    <panel
+      follows="all"
+      height="370"
+      layout="topleft"
+      left="5"
+      name="buttons_panel"
+      right="-5"
+      top_pad="5">
+    <conversation_log_list
+      opaque="true"
+      allow_select="true"
+      follows="all"
+      height="360"
+      layout="topleft"
+      left="3"
+      keep_selection_visible_on_reshape="true"
+      item_pad="2"
+      multi_select="false"
+      name="conversation_log_list"
+      right="-3"
+      top="5" />
+    </panel>
+</floater>
-- 
cgit v1.2.3


From 0b5abcfa8e2adbeb9c9f12644f36ee2c4daee560 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 27 Jul 2012 16:14:31 +0300
Subject: Micro fix for string.xml

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9ccd6b5cbe..752710373c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2140,8 +2140,10 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="InvFolder Gestures">Gestures</string>
 	<string name="InvFolder Favorite">My Favorites</string>
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
-  We should localize both of them with the same value -->
+      Also, it can be written as "Favorite" or "Favorites".
+  We should localize all variants of them with the same value -->
 	<string name="InvFolder favorite">My Favorites</string>
+	<string name="InvFolder Favorites">My Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
@@ -2150,6 +2152,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>
+	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder All">All</string>
 
 	<string name="no_attachments">No attachments worn</string>
-- 
cgit v1.2.3


From 4285cc271eacaca31a1d5d76c8e88debf00235c2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 30 Jul 2012 15:15:42 -0700
Subject: CHUI-217 FIX Items are not visible in Merchant Outbox cleaned up a
 lot custom code for folder view item creation in inbox and outbox proper
 initialization of views from inventory panel starting folder

---
 .../skins/default/xui/en/panel_inbox_inventory.xml     |  2 +-
 indra/newview/skins/default/xui/en/panel_landmarks.xml |  8 ++++----
 .../skins/default/xui/en/panel_outbox_inventory.xml    | 18 +++++++++++++-----
 .../default/xui/en/widgets/inbox_inventory_panel.xml   |  3 ++-
 .../xui/en/widgets/outbox_folder_view_folder.xml       |  9 ---------
 .../default/xui/en/widgets/outbox_inventory_panel.xml  |  2 --
 6 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 413e22e444..48d38d50e0 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -2,7 +2,7 @@
 <inbox_inventory_panel
     accepts_drag_and_drop="false"
     name="inventory_inbox"
-    start_folder="Received Items"
+    start_folder.name="Received Items"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 2a5933e3e9..39805637a0 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -35,7 +35,7 @@
              left="0"
              mouse_opaque="true"
              name="favorites_list"
-             start_folder="Favorites"
+             start_folder.name="Favorites"
              width="307"/>
         </accordion_tab>
         <accordion_tab
@@ -51,7 +51,7 @@
              left="0"
              mouse_opaque="true"
              name="landmarks_list"
-             start_folder="Landmarks"
+             start_folder.name="Landmarks"
              width="307"/>
         </accordion_tab>
         <accordion_tab
@@ -67,7 +67,7 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
-             start_folder="My Inventory"
+             start_folder.name="My Inventory"
              width="307"/>
           </accordion_tab>
           <accordion_tab
@@ -83,7 +83,7 @@
              left="0"
              mouse_opaque="true"
              name="library_list"
-             start_folder="LIBRARY"
+             start_folder.name="LIBRARY"
              width="313"/>
         </accordion_tab>
     </accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index a3d39e55af..203febbf18 100644
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_inventory_panel
+<inventory_panel
     name="inventory_outbox"
-    start_folder="Outbox"
+    start_folder.name="Outbox"
+    show_empty_message="false"
+    show_load_status="false"
+    start_folder.type="outbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
@@ -12,6 +15,11 @@
     bevel_style="none"
     show_item_link_overlays="true"
     tool_tip="Drag and drop items here to prepare them for sale on your storefront"
-    >
-    <scroll reserve_scroll_corner="false" />
-</outbox_inventory_panel>
+    scroll.reserve_scroll_corner="false">
+      <folder folder_arrow_image="Folder_Arrow"
+              folder_indentation="8"
+              item_height="20"
+              item_top_pad="4"
+              selection_image="Rounded_Square"/>
+      <item allow_open="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
index 830c27bdac..d5b10e7f51 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inbox_inventory_panel show_load_status="false" />
+<inbox_inventory_panel show_load_status="false"
+                       start_folder.type="inbox"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
deleted file mode 100644
index d19c47f54f..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_folder_view_folder
-  folder_arrow_image="Folder_Arrow"
-  folder_indentation="8"
-  item_height="20" 
-  item_top_pad="4"
-  selection_image="Rounded_Square"
-  >
-</outbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
deleted file mode 100644
index 3964569da2..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_inventory_panel show_empty_message="false" show_load_status="false" />
-- 
cgit v1.2.3


From b57d8e9c06e01cc6aa2eca17fa80da0a36a52b91 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 30 Jul 2012 19:09:48 -0700
Subject: CHUI-258: Adding a method to better whether nearby chat is visible or
 not.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3d057fa8f5..f3d2762d3f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4204,6 +4204,8 @@ Are you sure you want to change the Estate Covenant?
   <notification
    icon="notifytip.tga"
    name="RegionEntryAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
    <tag>fail</tag>
 The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
@@ -4212,6 +4214,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
   <notification
    icon="notifytip.tga"
    name="RegionEntryAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <tag>fail</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
@@ -4283,6 +4287,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
   <notification
    icon="notifytip.tga"
    name="TeleportEntryAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <unique>
       <context>REGIONMATURITY</context>
@@ -4294,6 +4300,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
   <notification
    icon="notifytip.tga"
    name="TeleportEntryAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <unique>
       <context>REGIONMATURITY</context>
@@ -4414,6 +4422,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandClaimAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
     <tag>fail</tag>
@@ -4422,6 +4432,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandClaimAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <tag>fail</tag>
     The land you're trying to claim contains [REGIONMATURITY] content, which is accessible to adults only.
@@ -4479,6 +4491,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandBuyAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
     <tag>fail</tag>
@@ -4487,6 +4501,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandBuyAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <tag>fail</tag>
     The land you're trying to buy contains [REGIONMATURITY] content, which is accessible to adults only.
-- 
cgit v1.2.3


From b7536a307cc51aadacc375a2376dde199f26a7d6 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 31 Jul 2012 13:48:59 -0700
Subject: CHUI-258: Ensuring that the teleport lure requests are logged to IM
 and not to nearby chat.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f3d2762d3f..e85637826d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6413,6 +6413,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="TeleportOffered"
    log_to_im="true"
+   log_to_chat="false"
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -6434,6 +6435,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOffered_MaturityExceeded"
+   log_to_im="true"
+   log_to_chat="false"
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -6457,6 +6460,8 @@ This region contains [REGION_CONTENT_MATURITY] content, but your current prefere
   <notification
    icon="notify.tga"
    name="TeleportOffered_MaturityBlocked"
+   log_to_im="true"
+   log_to_chat="false"
    type="notifytip">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -6471,6 +6476,7 @@ However, this region contains content accessible to adults only.
    icon="notify.tga"
    name="TeleportOfferSent"
    log_to_im="true"
+   log_to_chat="false"
    show_toast="false"
    type="offer">
 	Teleport offer sent to [TO_NAME]
-- 
cgit v1.2.3


From c3bc6de8ba90216d3687f70e01e92accde956a85 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 1 Aug 2012 09:36:10 -0700
Subject: CHUI-218 FIX (Items and Item count is not show in Received Items
 folder in Inventory) forgot to check in

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 48d38d50e0..433a3181cd 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -2,7 +2,7 @@
 <inbox_inventory_panel
     accepts_drag_and_drop="false"
     name="inventory_inbox"
-    start_folder.name="Received Items"
+    start_folder.type="inbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
-- 
cgit v1.2.3


From 0fa1e2b9ae41bb06e5c7db90900d4f469f44b8d3 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 2 Aug 2012 18:43:44 +0300
Subject: CHUI-230, CHUI-232, CHUI-261 Forced resize of a conversation's
 floater in the IM-container; support of the rectControls for
 IM-conversations; fixed LLFloater and LLMultiFloater for the correct hosting
 of floaters with mSaveRect

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 09c1510004..675967035f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -15,7 +15,8 @@
  can_resize="true"
  can_tear_off="false"
  min_width="250"
- min_height="190">
+ min_height="190"
+ positioning="relative">
     <floater.string 
      name="NearbyChatTitle"
      value="Nearby Chat"/>
-- 
cgit v1.2.3


From 291e78732374f428e43bb6bf5967ed3a114d0f18 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 3 Aug 2012 11:56:19 -0700
Subject: CHUI-265: Problem was that the each accordian tab was using the
 llinvetorypanel object to display contents. The llinventorypanel was designed
 by default to use a scrollbar horizontally/vertically, just like in the
 inventory floater. Resolution: Now set a flag to hide the scrollbar for each
 accordian tab.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 39805637a0..ebd4c6a805 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -35,6 +35,7 @@
              left="0"
              mouse_opaque="true"
              name="favorites_list"
+             scroll.hide_scrollbar="true"
              start_folder.name="Favorites"
              width="307"/>
         </accordion_tab>
@@ -51,6 +52,7 @@
              left="0"
              mouse_opaque="true"
              name="landmarks_list"
+             scroll.hide_scrollbar="true"
              start_folder.name="Landmarks"
              width="307"/>
         </accordion_tab>
@@ -67,6 +69,7 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
+             scroll.hide_scrollbar="true"
              start_folder.name="My Inventory"
              width="307"/>
           </accordion_tab>
@@ -83,6 +86,7 @@
              left="0"
              mouse_opaque="true"
              name="library_list"
+             scroll.hide_scrollbar="true"
              start_folder.name="LIBRARY"
              width="313"/>
         </accordion_tab>
-- 
cgit v1.2.3


From 3b525b788da802c8847bb2b5881c45519109ac11 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 3 Aug 2012 18:02:28 +0300
Subject: CHUI-241 (Add drag handle in UI to resize width of conversations
 list): implemented drag handle via predefined params of layout panels

---
 .../skins/default/xui/en/floater_im_container.xml  | 12 ++++---
 .../skins/default/xui/en/floater_im_session.xml    | 39 +++++++++++-----------
 2 files changed, 28 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e8ef3c1df9..ea6fd65b95 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -31,10 +31,12 @@
      width="680">
         <layout_panel
          auto_resize="true"
+         user_resize="true"        
          height="430"
          name="conversations_layout_panel"
          min_dim="51"
-         width="268">
+         width="268"
+         min_width="120">
             <layout_stack
              animate="false" 
              follows="left|top|right"
@@ -107,17 +109,19 @@
         </layout_panel>
         <layout_panel
          auto_resize="true"
+         user_resize="true"
          height="430"
          name="messages_layout_panel"
-         width="412">
+         width="412"
+         min_width="205">
             <panel_container
              follows="all"
              height="430"
              layout="topleft"
-             left="10"
+             left="0"
              name="im_box_tab_container"
              top="0"
-             width="402"/>
+             width="412"/>
         </layout_panel>
     </layout_stack>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 675967035f..4abe4d6941 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -213,8 +213,8 @@
             </layout_panel>
             <layout_panel
              height="248"
-             width="234"
-          layout="topleft"
+             width="230"
+             layout="topleft"
              follows="all"
              left_delta="0"
              top_delta="0"
@@ -231,28 +231,29 @@
          name="chat_history"
          parse_highlights="true"
          parse_urls="true"
-        left="1"
-             		width="229">
+       	 width="230"
+       	 left="0">
         </chat_history>
             </layout_panel>
            </layout_stack>
            </panel>
             <chat_editor
-         bottom="0"
-              expand_lines_count="5"
-         follows="left|right|bottom"
-	 font="SansSerifSmall"
-              visible="true"
-         height="20"
-              is_expandable="true"
-         label="To"
-         layout="bottomleft"
-         name="chat_editor"
-              max_length="1023"
-         spellcheck="true"
-         tab_group="3"
-              width="240"
-              wrap="true">
+             bottom="0"
+             expand_lines_count="5"
+             follows="left|right|bottom"
+	         font="SansSerifSmall"
+             visible="true"
+             height="20"
+             is_expandable="true"
+             label="To"
+             layout="bottomleft"
+             name="chat_editor"
+             max_length="1023"
+             spellcheck="true"
+             tab_group="3"
+             width="220"
+             left="10"
+             wrap="true">
             </chat_editor>
     </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3


From aa011b98e39d9669c0bb06a25c18b092122d9252 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 6 Aug 2012 11:59:54 -0700
Subject: CHUI-276: Problem was that the flag to use ellipses was not turned on
 for the folderview's inside the Places folder. Resolution was to turn on the
 flag inside the panel_landmarks.xml file for each folder displayed (favorites
 bar, my landmarks and etc.)

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index ebd4c6a805..67a09949ce 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -36,6 +36,7 @@
              mouse_opaque="true"
              name="favorites_list"
              scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
              start_folder.name="Favorites"
              width="307"/>
         </accordion_tab>
@@ -53,6 +54,7 @@
              mouse_opaque="true"
              name="landmarks_list"
              scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
              start_folder.name="Landmarks"
              width="307"/>
         </accordion_tab>
@@ -70,6 +72,7 @@
              mouse_opaque="true"
              name="my_inventory_list"
              scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
              start_folder.name="My Inventory"
              width="307"/>
           </accordion_tab>
@@ -87,6 +90,7 @@
              mouse_opaque="true"
              name="library_list"
              scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
              start_folder.name="LIBRARY"
              width="313"/>
         </accordion_tab>
-- 
cgit v1.2.3


From 4e96efd42e44197fc33bae3c61871457213f9764 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 16:55:13 +0300
Subject: MAINT-257 FIXED Increase minimum width to avoid overlaping

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 06d4327293..eb01294831 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -5,7 +5,7 @@
  height="640"
  layout="topleft"
  min_height="230"
- min_width="650"
+ min_width="750"
  name="gui_preview_tool"
  help_topic="gui_preview_tool"
  single_instance="true"
-- 
cgit v1.2.3


From f02ec7b00cdbac7ba8be3baac5a12646a85235b6 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 17:20:59 +0300
Subject: MAINT-1069 FIXED Change "follows" attribute for scroll list to
 "left|top|right"

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index eea2606125..df91ad8b5e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -254,7 +254,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          column_padding="0"
          draw_stripes="true"
          height="200"
-         follows="left|top"
+         follows="left|top|right"
          layout="topleft"
          left="0"
          right="-1"
-- 
cgit v1.2.3


From ff2bb96a55e8869843174be7324b0a59578a4f0d Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 18:26:19 +0300
Subject: MAINT-105 FIXED New function to check People tabs visibility

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..c6d9f9ef8f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -276,30 +276,39 @@
              parameter="gestures" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu_item_call
+        <menu_item_check
          label="Friends"
          name="My Friends"
          shortcut="control|shift|F">
-            <menu_item_call.on_click
+            <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="friends_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="friends_panel" />
-            </menu_item_call>
-        <menu_item_call
+            </menu_item_check>
+        <menu_item_check
          label="Groups"
          name="My Groups"
          shortcut="control|shift|G">
-            <menu_item_call.on_click
+         	<menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="groups_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
-        </menu_item_call>
-        <menu_item_call
+        </menu_item_check>
+        <menu_item_check
          label="Nearby people"
          name="Active Speakers"
          shortcut="control|shift|A">
-            <menu_item_call.on_click
+        	 <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="nearby_panel" />
+            <menu_item_check.on_click
               function="SideTray.PanelPeopleTab"
               parameter="nearby_panel" />
-        </menu_item_call>
+        </menu_item_check>
         <menu_item_call
          label="Block List"
          name="Block List">
-- 
cgit v1.2.3


From 324200dfd7d70324fe15329100140d98bb1f9b17 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 9 Aug 2012 00:00:25 +0300
Subject: CHUI-120 WIP Added notifications about newly invited chat
 participants.

---
 indra/newview/skins/default/xui/en/floater_im_session.xml |  6 ++++++
 indra/newview/skins/default/xui/en/notifications.xml      | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 4abe4d6941..2b63430106 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -34,6 +34,12 @@
     <floater.string
      name="return_icon"
      value="Conv_toolbar_arrow_sw"/>
+    <floater.string
+     name="participants_added"
+     value="New participant(s) were invited to the conversation: [NAMES]."/>
+    <floater.string
+     name="participants_added_new_window"
+     value="New participant(s) were invited to the conversation: [NAMES]. The conversation will be started in a new window."/>
     <view
         follows="all"
         layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e85637826d..2ffa2cfb22 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4946,6 +4946,20 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor
      yestext="Go to page"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmAddingChatParticipants"
+   type="alertmodal">
+    <unique/>
+When you add a person to an existing conversation, a new conversation will be created.  All participants will receive new conversation notifications.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm adding chat paticipants"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Ok"/>
+  </notification>
+ 
   <notification
    icon="alertmodal.tga"
    name="ConfirmQuit"
-- 
cgit v1.2.3


From 160c6d4d3baa3b7402a1efc1e779d2306ee906a2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 9 Aug 2012 13:45:20 +0300
Subject: MAINT-274 FIXED "media_info" width is decreased to avoid overlaying

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5204efbf65..436e9f8fed 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2994,7 +2994,7 @@ even though the user gets a free copy.
                          use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
-			 width="280" />
+			 width="180" />
       <web_browser
         visible="false"
         enabled="false"
-- 
cgit v1.2.3


From 1408a0831bf7c713052e0b73f4c5e8a3deddd9d2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 9 Aug 2012 15:44:10 +0300
Subject: MAINT-913 FIXED Added "Zoom" combobox menu item

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

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index e9a787cef0..f1ae14809f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -292,6 +292,10 @@
           label="Open"
           name="Open"
           value="Open" />
+       <combo_box.item
+          label="Zoom"
+          name="Zoom"
+          value="Zoom" />
     </combo_box>
     <panel
         border="false"
-- 
cgit v1.2.3


From 6cf49a4a715c9f498d4b063f8d74e295be1f418c Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 9 Aug 2012 16:48:33 +0300
Subject: CHUI-171 WIP (Conversation not automatically readded to conversation
 window listing when open) - removal of the dependence between items of the
 conversations list and conversation's floaters.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 4abe4d6941..37aa8bb787 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -17,9 +17,6 @@
  min_width="250"
  min_height="190"
  positioning="relative">
-    <floater.string 
-     name="NearbyChatTitle"
-     value="Nearby Chat"/>
     <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
     <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
     <floater.string
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2806bcaa2e..696c282887 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -384,13 +384,14 @@ Please try logging in again in a minute.</string>
 	<string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string>
 
 	<!-- Chat -->
+	<string name="NearbyChatTitle">Nearby chat</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>
 	<string name="connected">Connected</string>
 	<string name="unavailable">Voice not available at your current location</string>
 	<string name="hang_up">Disconnected from in-world Voice Chat</string>
-  <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
+    <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
 	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
-- 
cgit v1.2.3


From f744fe8b5496e8d2d357ce88b3552eeee2125a5e Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 10 Aug 2012 02:51:56 +0300
Subject: CHUI-120 WIP Different notifications about single and multiple chat
 participants invited. The notification about starting a new conversation now
 applies only to P2P chat. Some code refactoring and clean up.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 2b63430106..de8d5f22fd 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -35,11 +35,14 @@
      name="return_icon"
      value="Conv_toolbar_arrow_sw"/>
     <floater.string
-     name="participants_added"
-     value="New participant(s) were invited to the conversation: [NAMES]."/>
+     name="participant_added"
+     value="[NAME] was invited to the conversation.[NEW_WINDOW]"/>
     <floater.string
-     name="participants_added_new_window"
-     value="New participant(s) were invited to the conversation: [NAMES]. The conversation will be started in a new window."/>
+     name="multiple_participants_added"
+     value="[NAME] were invited to the conversation.[NEW_WINDOW]"/>
+    <floater.string
+     name="new_window"
+     value=" The conversation will be started in a new window."/>
     <view
         follows="all"
         layout="topleft"
-- 
cgit v1.2.3


From c234ef4b3a1ab22132512958c324e5f796912144 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 15 Aug 2012 15:06:25 +0300
Subject: CHUI-235 FIXED (Create icons for new conversation log list items)

- Replaced old icons with new ones
---
 .../skins/default/xui/en/panel_conversation_log_list_item.xml    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
index 3c98e32e7d..cee7d8581a 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -33,19 +33,18 @@
      height="20"
      layout="topleft"
      left="5"
-     image_name="Audio_Press"
+     image_name="Conv_toolbar_open_call"
      mouse_opaque="true"
      name="voice_session_icon"
      top="2"
      visible="false"
      width="20" />
     <icon
-     default_icon_name="incoming_unread_im_icon"
      follows="top|left"
      height="20"
      layout="topleft"
      left="5"
-     image_name="Movement_Backward_Off"
+     image_name="Conv_log_inbox"
      mouse_opaque="false"
      name="unread_ims_icon"
      top="2"
@@ -98,8 +97,8 @@
      name="delete_btn"
      layout="topleft"
      follows="top|right"
-     image_unselected="Toast_CloseBtn"
-     image_selected="Toast_CloseBtn"
+     image_unselected="Conv_toolbar_close"
+     image_selected="Conv_toolbar_close"
      top="5"
      left_pad="0"
      height="14"
-- 
cgit v1.2.3


From effccb94489d41a533e76f5f5834d52e3e817cbd Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 16 Aug 2012 04:55:48 +0300
Subject: CHUI-120 WIP Notifications about added chat participants should be
 sent to the conference when those participants actually join. - Removed
 notifying existing P2P participants about ad hoc conference staring in a new
 window. Now the notifications should arrive in that new window. - Fixed
 "Cancel" button which had no effect in adding P2P participants notification.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index de8d5f22fd..15d3dc30ae 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -36,13 +36,10 @@
      value="Conv_toolbar_arrow_sw"/>
     <floater.string
      name="participant_added"
-     value="[NAME] was invited to the conversation.[NEW_WINDOW]"/>
+     value="[NAME] was invited to the conversation."/>
     <floater.string
      name="multiple_participants_added"
-     value="[NAME] were invited to the conversation.[NEW_WINDOW]"/>
-    <floater.string
-     name="new_window"
-     value=" The conversation will be started in a new window."/>
+     value="[NAME] were invited to the conversation."/>
     <view
         follows="all"
         layout="topleft"
-- 
cgit v1.2.3


From 2e1f38695f72020062a09038cc021fff462785bd Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 16 Aug 2012 12:32:39 +0300
Subject: MAINT-915 FIXED Changed max_length to max_length_bytes

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index cdf14572fe..e844a15118 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -30,7 +30,7 @@
     (This page does not pass the specified whitelist)
   </text>
   <line_editor 
-   max_length="1024"
+   max_length_bytes="1024"
    bottom_delta="-24" 
    enabled="true" 
    follows="left|top" 
-- 
cgit v1.2.3


From 7f26bbac80669ecd15b666cc6c5ffec77945438b Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 16 Aug 2012 17:37:26 +0300
Subject: CHUI-278, CHUI-288 FIXED Panels in conversations floater does not
 fully collapse: changed parameter min_width -> expanded_min_dim

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index ea6fd65b95..e439fc9005 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -34,9 +34,9 @@
          user_resize="true"        
          height="430"
          name="conversations_layout_panel"
-         min_dim="51"
+         min_dim="38"
          width="268"
-         min_width="120">
+         expanded_min_dim="120">
             <layout_stack
              animate="false" 
              follows="left|top|right"
@@ -113,7 +113,7 @@
          height="430"
          name="messages_layout_panel"
          width="412"
-         min_width="205">
+         expanded_min_dim="205">
             <panel_container
              follows="all"
              height="430"
-- 
cgit v1.2.3


From 8922dec40039a10e770243f3047793f8501fe43a Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 21 Aug 2012 19:51:41 +0300
Subject: CHUI-293 CHUI-294 FIXED displaying Group Invite and Transfer Object
 as notifications, instead of displaying as messages from an object. Restored
 the exception in handling "LoadWebPage", "ScriptDialog" and
 "ScriptDialogGroup" notifications, that caused only those notifications to be
 shown as messages from an object.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 64db7cd969..933135954f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6742,6 +6742,7 @@ If you stay in this region you will be logged out.
   <notification
    icon="notify.tga"
    name="LoadWebPage"
+   show_toast="false"
    type="notify">
 Load web page [URL]?
 
@@ -6844,6 +6845,7 @@ It is rare that such a request is legitimate. Do not allow access if you do not
   <notification
    icon="notify.tga"
    name="ScriptDialog"
+   show_toast="false"
    type="notify">
 [NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
@@ -6862,6 +6864,7 @@ It is rare that such a request is legitimate. Do not allow access if you do not
   <notification
    icon="notify.tga"
    name="ScriptDialogGroup"
+   show_toast="false"
    type="notify">
     <tag>group</tag>
 [GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
-- 
cgit v1.2.3


From f93b94daa978e1bcf1897e0459fa8700f58d62d1 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 22 Aug 2012 11:42:44 +0300
Subject: MAINT-56 FIXED collapse_all_folders() and expand_all_folders()
 functions are added, which are called by menu items in gear menu.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index fc7272b904..3b8ace6308 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -194,6 +194,20 @@
             <!-- copied from menu_inventory_add.xml -->
 
     <menu_item_separator name="sepatator2" />
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Gear.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse">
+        <on_click
+         function="Gear.Collapse" />
+    </menu_item_call>
     <menu_item_call
      label="Rename Outfit"
      layout="topleft"
-- 
cgit v1.2.3


From 10d2f695c8bf17357438729a1bf1a7f7bd1ee3f2 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 14 Sep 2012 13:59:32 +0300
Subject: CHUI-321 ADDITIONAL FIX (Indicate within the Call Log why there's
 nothing in it)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index df78bbccec..12d17e6b37 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -15,7 +15,7 @@
   width="450">
   
   <string name="logging_calls_disabled">
-     Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy.
+     Conversations are not being logged. To log conversations in the future, select "Save IM logs on my computer" under Preferences > Privacy.
   </string>
   
 	<panel
-- 
cgit v1.2.3


From 14708a3ace184b0654ca7923732be6e06962d583 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 22 Aug 2012 18:27:29 +0300
Subject: CHUI_310 make NearbyChat a singletone

---
 indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/de/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml           | 4 ++--
 indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/es/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/fr/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/it/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/ja/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/pt/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/ru/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/tr/floater_chat_bar.xml      | 2 +-
 indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml | 2 +-
 indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
index 949cbcbd7b..eb104201f8 100644
--- a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Klik her for at chatte." name="chat_box" tool_tip="Tryk på enter for at tale, Ctrl-Enter for at råbe."/>
 	<button name="show_nearby_chat" tool_tip="Viser/skjuler log for chat nærved"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
index 2464a55665..ab77d4dae5 100644
--- a/indra/newview/skins/default/xui/de/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT IN DER NÄHE">
+<floater name="nearby_chat" title="CHAT IN DER NÄHE">
 	<panel name="bottom_panel">
 		<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabetaste zum Sprechen, Strg+Eingabe zum Rufen"/>
 		<button name="show_nearby_chat" tool_tip="Chatprotokoll in der Nähe ein-/ausblenden"/>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
index 08cc0b0ec8..69cf6d98de 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabe drücken, um zu sprechen, Strg-Eingabe drücken, um zu Rufen."/>
 	<button name="show_nearby_chat" tool_tip="Protokoll des Chats in der Nähe anzeigen/ausblenden"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..aa131035ed 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -225,10 +225,10 @@
          use_mac_ctrl="true">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="chat_bar" />
+             parameter="nearby_chat" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="chat_bar" />
+             parameter="nearby_chat" />
         </menu_item_check>
         <menu_item_check
          label="Speak"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
index f4722b05d6..27a27473d8 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
@@ -46,7 +46,7 @@
             follows="left|right"
             top="4"
             width="310"
-            name="chat_bar"
+            name="nearby_chat"
             mouse_opaque="false"/>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 6bc9c48729..19143cef89 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -5,7 +5,7 @@
  height="25"
  layout="topleft"
  left="0"
- name="chat_bar"
+ name="nearby_chat"
  top="21"
  width="308">
     <line_editor
diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
index 2e94805057..02369c9a43 100644
--- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT">
+<floater name="nearby_chat" title="CHAT">
 	<panel name="bottom_panel">
 		<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 		<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
index af2b6e920b..e6ca59f912 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
index 890411d091..7dcb9a280d 100644
--- a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT PRÈS DE MOI">
+<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
 	<panel name="bottom_panel">
 		<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl+Entrée pour crier"/>
 		<button name="show_nearby_chat" tool_tip="Afficher/masquer le journal de chat près de vous."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
index 82cdf292ab..762dee01bb 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/>
 	<button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
index 94c85b50c8..b47e32ce90 100644
--- a/indra/newview/skins/default/xui/it/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT NEI DINTORNI">
+<floater name="nearby_chat" title="CHAT NEI DINTORNI">
 	<panel name="bottom_panel">
 		<line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per parlare, Ctrl+Invio per gridare"/>
 		<button name="show_nearby_chat" tool_tip="Mostra/Nasconde il registro della chat nei dintorni"/>
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
index 6317d3192e..1fef88870a 100644
--- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<string name="min_width">
 		192
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
index 11f223ade6..9f5df6fb85 100644
--- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="近くのチャット">
+<floater name="nearby_chat" title="近くのチャット">
 	<panel name="bottom_panel">
 		<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して話し、Ctrl + Enter キーで叫びます。"/>
 		<button name="show_nearby_chat" tool_tip="近くのチャットログを表示／非表示"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 5998206f27..201fb0a376 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/>
 	<button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
index 63cf96b571..4ed3ff669b 100644
--- a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<string name="min_width">
 		192
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
index 72016c6b40..2eb2c94940 100644
--- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="BATE-PAPO LOCAL">
+<floater name="nearby_chat" title="BATE-PAPO LOCAL">
 	<panel name="bottom_panel">
 		<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
 		<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
index 9b993488be..5628a87109 100644
--- a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
 	<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
index 79b7b033fb..f6b2fc81e1 100644
--- a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="ЛОКАЛЬНЫЙ ЧАТ">
+<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
 	<panel name="bottom_panel">
 		<line_editor label="Щелкните здесь для общения." name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
 		<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
index 804ba7def7..395c643b0b 100644
--- a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Щелкните здесь для общения" name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
 	<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
index 988c845982..cd999b4b7a 100644
--- a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="YAKINDAKİ SOHBET">
+<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
 	<panel name="bottom_panel">
 		<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
 		<button name="show_nearby_chat" tool_tip="Yakın sohbet günlüğünü gösterir/gizler"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
index fd954475ac..7d191191c4 100644
--- a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
 	<button name="show_nearby_chat" tool_tip="yakın sohbet günlüğünü gösterir/gizler"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
index 3cabfcfaba..f27f205c44 100644
--- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="點擊此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
 	<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
 </panel>
-- 
cgit v1.2.3


From 632618be6540c7e9cc0022f01badda8b989866ed Mon Sep 17 00:00:00 2001
From: MaksymS ProductEngine <msavchenko@productengine.com>
Date: Fri, 24 Aug 2012 01:02:42 +0300
Subject: MAINT-1400 FIXED duplicated IDs in two files: notifications.xml and
 floater_texture_ctrl.xml

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 10 ----------
 indra/newview/skins/default/xui/en/notifications.xml        | 12 ------------
 2 files changed, 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 2e29c61cb2..6021ba0a5a 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -134,16 +134,6 @@
      top_delta="-25"
      name="Pipette"
      width="28" />
-   <check_box
-     follows="left|bottom"
-     height="20"
-     initial_value="true"
-     label="Live Preview"
-     layout="topleft"
-     left="4"
-     name="apply_immediate_check"
-     top="262"
-     width="120" />
    <text
      follows="left|bottom"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 13f073a1c2..bfb8d61ca6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7569,18 +7569,6 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME]
    name="LivePreviewUnavailable"
    type="alert">
    
-We cannot display a preview of this texture because it is no-copy and/or no-transfer.
-  <usetemplate
-    ignoretext="Warn me that Live Preview mode is not available for no-copy and/or no-transfer textures"
-    name="okignore"
-    yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LivePreviewUnavailable"
-   type="alert">
-   
 We cannot display a preview of this texture because it is no-copy and/or no-transfer.
   <usetemplate
     ignoretext="Warn me that Live Preview mode is not available for no-copy and/or no-transfer textures"
-- 
cgit v1.2.3


From d4ee17e533d652e90989e60bcbc097c81e73d081 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 28 Aug 2012 14:48:32 +0300
Subject: CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM
 log file)

- Renamed LLLogChat::loadAllHistory to LLLogChat::loadChatHistory because it doesn't actually loads all history. Also added parameter to the function which is a flag whether to load all file's content or not.
- Implemented displaying history by pages (as was decided on meeting page): Added showHistory() method to the LLFloaterConversationPreview which shows the chat history page by page starting from the last conversation (or may say starting from the last page). One page contains 100 entries. Added "More history..." button to display next page of history.
---
 .../skins/default/xui/en/floater_conversation_preview.xml    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 27b744aefb..c837a0ee57 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="361"
+ height="391"
  layout="topleft"
  min_height="243"
  min_width="234"
@@ -50,4 +50,14 @@
      left="5"
      width="390">
     </chat_history>
+    <button
+     follows="bottom|right"
+     height="22"
+     layout="topleft"
+     name="more_history"
+     label="More history..."
+     right="-15"
+     top_pad="5"
+     width="100">
+    </button>
 </floater>
-- 
cgit v1.2.3


From 1413404508fc418ee5a21f5e7b3e74da8f138cd9 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 29 Aug 2012 19:35:11 -0700
Subject: First pass at throwing together a test panel for the material
 capability service.

---
 .../skins/default/xui/en/floater_stinson.xml       | 93 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 +++
 2 files changed, 103 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_stinson.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
new file mode 100644
index 0000000000..0ec6b281cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_stinson.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    positioning="cascading"
+    can_tear_off="false"
+    height="160"
+    layout="topleft"
+    name="floater_stinson"
+    help_topic="floater_stinson"
+    reuse_instance="true"
+    save_rect="true"
+    single_instance="true"
+    title="Stinson Test"
+    width="240">
+  <floater.string name="status_no_region">No current region available.</floater.string>
+  <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
+  <floater.string name="status_ready">Materials are enabled for this region.</floater.string>
+  <floater.string name="status_request_started">Request sent.</floater.string>
+  <floater.string name="status_request_completed">Request received.</floater.string>
+  <floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string>
+  <floater.string name="status_error">An error occurred during the request.</floater.string>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="61"
+      width="214">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="0"
+        width="214">
+      Status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="MaterialGoodColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="material_status"
+        top_pad="8"
+        width="214">
+    </text>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|right|bottom"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
+      left="12"
+      width="214"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="61"
+      width="214">
+    <button
+        follows="left|top"
+        height="22"
+        label="Get"
+        layout="topleft"
+        name="get_button"
+        top_pad="0"
+        width="214"/>
+    <button
+        follows="left|top"
+        height="22"
+        label="Put"
+        layout="topleft"
+        name="put_button"
+        top_pad="12"
+        width="214"/>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..e94253fcf6 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -987,6 +987,16 @@
       </menu>
 
 
+      <menu_item_separator/>
+
+      <menu_item_call
+          label="Stinson"
+          name="StinsonMenu">
+        <menu_item_call.on_click
+            function="Floater.ToggleOrBringToFront"
+            parameter="floater_stinson" />
+      </menu_item_call>
+
       <menu_item_separator/>
 
         <menu
-- 
cgit v1.2.3


From 86fe86702e582e43be8e9fa0338a2fb8a8056771 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 30 Aug 2012 19:46:21 -0700
Subject: Adding results from the Get method to a scroll list table.

---
 .../skins/default/xui/en/floater_stinson.xml       | 87 +++++++++++++++++++---
 1 file changed, 76 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
index 0ec6b281cf..559e6eb48f 100644
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ b/indra/newview/skins/default/xui/en/floater_stinson.xml
@@ -2,15 +2,18 @@
 <floater
     positioning="cascading"
     can_tear_off="false"
-    height="160"
+    can_resize="true"
+    height="315"
+    width="1194"
+    min_height="315"
+    min_width="1100"
     layout="topleft"
     name="floater_stinson"
     help_topic="floater_stinson"
     reuse_instance="true"
-    save_rect="true"
+    save_rect="false"
     single_instance="true"
-    title="Stinson Test"
-    width="240">
+    title="Stinson Test">
   <floater.string name="status_no_region">No current region available.</floater.string>
   <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
   <floater.string name="status_ready">Materials are enabled for this region.</floater.string>
@@ -57,22 +60,21 @@
   </panel>
   <view_border
       bevel_style="none"
-      follows="left|right|bottom"
+      follows="left|right|top"
       height="0"
       layout="topleft"
       name="horiz_separator"
       top_pad="0"
       left="12"
-      width="214"/>
+      width="1170"/>
   <panel
       border="false"
       bevel_style="none"
-      follows="left|top"
+      follows="left|top|right"
       layout="topleft"
-      left="12"
+      height="167"
       top_pad="10"
-      height="61"
-      width="214">
+      width="1170">
     <button
         follows="left|top"
         height="22"
@@ -81,13 +83,76 @@
         name="get_button"
         top_pad="0"
         width="214"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="left|top|right"
+        height="135"
+        layout="topleft"
+        top_pad="10"
+        tab_stop="false"
+        multi_select="true"
+        name="materials_scroll_list"
+        width="1170">
+      <scroll_list.columns
+          label="ID"
+          name="id"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Normal Map"
+          name="normal_map"
+          width="230" />
+      <scroll_list.columns
+          label="Specular Map"
+          name="specular_map"
+          width="230" />
+      <scroll_list.columns
+          label="Specular Color"
+          name="specular_color"
+          width="120" />
+      <scroll_list.columns
+          label="Specular Exponent"
+          name="specular_exponent"
+          width="112" />
+      <scroll_list.columns
+          label="Env Intensity"
+          name="env_intensity"
+          width="80" />
+      <scroll_list.columns
+          label="Alpha Mask Cutoff"
+          name="alpha_mask_cutoff"
+          width="110" />
+      <scroll_list.columns
+          label="Is Diffuse Alpha Mask"
+          name="is_diffuse_alpha_mask"
+          width="128" />
+    </scroll_list>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|right|top"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="10"
+      left="12"
+      width="1170"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="22"
+      width="214">
     <button
         follows="left|top"
         height="22"
         label="Put"
         layout="topleft"
         name="put_button"
-        top_pad="12"
+        top_pad="0"
         width="214"/>
   </panel>
 </floater>
-- 
cgit v1.2.3


From dab6788c42260135d298b619ff92a71838bba2b8 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 31 Aug 2012 11:57:36 +0300
Subject: CHUI-157 FIXED (Implement menu bar for conversation floater)

- Added View Nearby chat history option
- Also replaced menu item "Add Friend / Remove" with two separate menus: Add Friend and Remove Friend. So if user is a Friend the Remove Friend option would be shown there. If the user is not a friend, the Add Friend option would be shown.
---
 .../default/xui/en/menu_conversation_log_gear.xml  | 28 ++++++++++++++--------
 .../default/xui/en/menu_conversation_log_view.xml  |  8 +++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
index b8d0eef956..8796b87955 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -57,20 +57,28 @@
       parameter="can_offer_teleport"/>
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_check
-     label="Add friend/Remove friend"
+    <menu_item_call
+     label="Add Friend"
      layout="topleft"
-     name="Friend_add_remove">
-        <menu_item_check.on_click
+     name="add_friend">
+        <on_click
          function="Calllog.Action"
-         parameter="add_rem_friend" />
-        <menu_item_check.on_check
+         parameter="add_friend"/>
+        <on_visible
+         function="Calllog.Check"
+         parameter="is_not_friend" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove Friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click
+         function="Calllog.Action"
+         parameter="remove_friend"/>
+        <on_visible
          function="Calllog.Check"
          parameter="is_friend" />
-        <menu_item_check.on_enable
-         function="Calllog.Enable"
-         parameter="add_rem_friend" />
-    </menu_item_check>
+    </menu_item_call>
     <menu_item_call
      label="Invite to group..."
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
index 4ab8cb4f7d..ce65b23971 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
@@ -34,4 +34,12 @@
        function="CallLog.Check"
        parameter="sort_friends_on_top" />
   </menu_item_check>
+  <menu_item_separator />
+  <menu_item_call
+   label="View Nearby chat history..."
+   name="view_nearby_chat_history">
+      <on_click
+       function="CallLog.Action"
+       parameter="view_nearby_chat_history" />
+  </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From c2bb1a189c5f4c2367ee38e03371b28948e3ea81 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 31 Aug 2012 12:05:36 +0300
Subject: CHUI-154 FIXED (Add link to chat preferences from Conversation
 floater)

- Added link to chat preferences from Conversation floater
---
 indra/newview/skins/default/xui/en/menu_participant_view.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 6401b0e3b7..df2700c94c 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -2,6 +2,13 @@
 <toggleable_menu
  layout="topleft"
  name="participant_manu_view">
+    <menu_item_call
+         label="Chat preferences..."
+         name="chat_preferences">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="chat_preferences" />
+      </menu_item_call>
     <menu_item_check
          label="Open conversation log"
          name="Conversation"
-- 
cgit v1.2.3


From 55b388b1a3994643c206aa31b3c155a47da02bef Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 31 Aug 2012 14:24:42 -0700
Subject: Adding a scroll list to report the response from the Put request.

---
 .../skins/default/xui/en/floater_stinson.xml       | 38 ++++++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
index 559e6eb48f..fc44615602 100644
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ b/indra/newview/skins/default/xui/en/floater_stinson.xml
@@ -3,9 +3,9 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="315"
+    height="425"
     width="1194"
-    min_height="315"
+    min_height="450"
     min_width="1100"
     layout="topleft"
     name="floater_stinson"
@@ -92,10 +92,10 @@
         top_pad="10"
         tab_stop="false"
         multi_select="true"
-        name="materials_scroll_list"
+        name="get_scroll_list"
         width="1170">
       <scroll_list.columns
-          label="ID"
+          label="Material ID"
           name="id"
           dynamic_width="true" />
       <scroll_list.columns
@@ -140,12 +140,12 @@
   <panel
       border="false"
       bevel_style="none"
-      follows="left|top"
+      follows="left|top|right"
       layout="topleft"
       left="12"
       top_pad="10"
-      height="22"
-      width="214">
+      height="132"
+      width="700">
     <button
         follows="left|top"
         height="22"
@@ -154,5 +154,29 @@
         name="put_button"
         top_pad="0"
         width="214"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="left|top|right"
+        height="100"
+        layout="topleft"
+        top_pad="10"
+        tab_stop="false"
+        multi_select="true"
+        name="put_scroll_list"
+        width="700">
+      <scroll_list.columns
+          label="Object ID"
+          name="object_id"
+          width="80" />
+      <scroll_list.columns
+          label="Face Index"
+          name="face_index"
+          width="70" />
+      <scroll_list.columns
+          label="MaterialID"
+          name="material_id"
+          dynamic_width="true" />
+    </scroll_list>
   </panel>
 </floater>
-- 
cgit v1.2.3


From 419cf7bfc91cff578fd46bfd466bc4f95c842862 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 31 Aug 2012 17:38:12 -0700
Subject: Implemented functionality to test Post requests.

---
 .../skins/default/xui/en/floater_stinson.xml       | 104 ++++++++++++++++++---
 1 file changed, 92 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
index fc44615602..7e23b270be 100644
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ b/indra/newview/skins/default/xui/en/floater_stinson.xml
@@ -3,9 +3,9 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="425"
-    width="1194"
-    min_height="450"
+    height="575"
+    width="1254"
+    min_height="600"
     min_width="1100"
     layout="topleft"
     name="floater_stinson"
@@ -66,7 +66,7 @@
       name="horiz_separator"
       top_pad="0"
       left="12"
-      width="1170"/>
+      width="1230"/>
   <panel
       border="false"
       bevel_style="none"
@@ -74,7 +74,7 @@
       layout="topleft"
       height="167"
       top_pad="10"
-      width="1170">
+      width="1230">
     <button
         follows="left|top"
         height="22"
@@ -93,7 +93,7 @@
         tab_stop="false"
         multi_select="true"
         name="get_scroll_list"
-        width="1170">
+        width="1230">
       <scroll_list.columns
           label="Material ID"
           name="id"
@@ -101,11 +101,11 @@
       <scroll_list.columns
           label="Normal Map"
           name="normal_map"
-          width="230" />
+          width="225" />
       <scroll_list.columns
           label="Specular Map"
           name="specular_map"
-          width="230" />
+          width="225" />
       <scroll_list.columns
           label="Specular Color"
           name="specular_color"
@@ -136,7 +136,7 @@
       name="horiz_separator"
       top_pad="10"
       left="12"
-      width="1170"/>
+      width="1230"/>
   <panel
       border="false"
       bevel_style="none"
@@ -145,7 +145,7 @@
       left="12"
       top_pad="10"
       height="132"
-      width="700">
+      width="400">
     <button
         follows="left|top"
         height="22"
@@ -164,7 +164,7 @@
         tab_stop="false"
         multi_select="true"
         name="put_scroll_list"
-        width="700">
+        width="400">
       <scroll_list.columns
           label="Object ID"
           name="object_id"
@@ -179,4 +179,84 @@
           dynamic_width="true" />
     </scroll_list>
   </panel>
-</floater>
+  <view_border
+      bevel_style="none"
+      follows="left|right|top"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="10"
+      left="12"
+      width="1230"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="132"
+      width="1230">
+    <button
+        follows="left|top"
+        height="22"
+        label="Post Good Material ID"
+        layout="topleft"
+        name="good_post_button"
+        top_pad="0"
+        width="214"/>
+    <button
+        follows="left|top"
+        height="22"
+        label="Post Bad Material ID"
+        layout="topleft"
+        name="bad_post_button"
+        left_pad="20"
+        width="214"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="left|top|right"
+        height="100"
+        layout="topleft"
+        top_pad="10"
+        left="0"
+        tab_stop="false"
+        multi_select="true"
+        name="post_scroll_list"
+        width="1230">
+      <scroll_list.columns
+          label="Material ID"
+          name="id"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Normal Map"
+          name="normal_map"
+          width="225" />
+      <scroll_list.columns
+          label="Specular Map"
+          name="specular_map"
+          width="225" />
+      <scroll_list.columns
+          label="Specular Color"
+          name="specular_color"
+          width="120" />
+      <scroll_list.columns
+          label="Specular Exponent"
+          name="specular_exponent"
+          width="112" />
+      <scroll_list.columns
+          label="Env Intensity"
+          name="env_intensity"
+          width="80" />
+      <scroll_list.columns
+          label="Alpha Mask Cutoff"
+          name="alpha_mask_cutoff"
+          width="110" />
+      <scroll_list.columns
+          label="Is Diffuse Alpha Mask"
+          name="is_diffuse_alpha_mask"
+          width="128" />
+    </scroll_list>
+  </panel>
+  </floater>
-- 
cgit v1.2.3


From d492666ce298fd992e6e84ceae58bafb8d0720bf Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 31 Aug 2012 18:16:46 -0700
Subject: Adding ability to clear the materials from the selected object faces.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
index 7e23b270be..ddfbcbd0c9 100644
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ b/indra/newview/skins/default/xui/en/floater_stinson.xml
@@ -149,17 +149,26 @@
     <button
         follows="left|top"
         height="22"
-        label="Put"
+        label="Put Face Data Set"
         layout="topleft"
-        name="put_button"
+        name="put_set_button"
         top_pad="0"
         width="214"/>
+    <button
+        follows="left|top"
+        height="22"
+        label="Put Face Data Clear"
+        layout="topleft"
+        name="put_clear_button"
+        left_pad="20"
+        width="214"/>
     <scroll_list
         column_padding="0"
         draw_heading="true"
         follows="left|top|right"
         height="100"
         layout="topleft"
+        left="0"
         top_pad="10"
         tab_stop="false"
         multi_select="true"
-- 
cgit v1.2.3


From eb13b2b4680ab80e8a20d341a481b8c1d62ca156 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Mon, 3 Sep 2012 17:42:20 +0300
Subject: CHUI-307 FIXED (LLInitParam::Parser::parserWarnings in log when
 adding conversations or deleting entries from conversation log )

- removed redundant incorrect attributes
---
 indra/newview/skins/default/xui/en/panel_blocked_list_item.xml         | 1 -
 .../newview/skins/default/xui/en/panel_conversation_log_list_item.xml  | 3 ---
 2 files changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
index 84e7e467b1..752321b949 100644
--- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -60,7 +60,6 @@
     <text
      follows="left|right"
      font="SansSerifSmall"
-     font.color="DkGray"
      height="15"
      layout="topleft"
      left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
index cee7d8581a..8a58eb1ca6 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -28,7 +28,6 @@
      visible="false"
      width="380" />
     <icon
-     default_icon_name="voice_session_icon"
      follows="top|left"
      height="20"
      layout="topleft"
@@ -72,7 +71,6 @@
     <text
      follows="left|right"
      font="SansSerifSmall"
-     font.color="DkGray"
      height="15"
      layout="topleft"
      left_pad="5"
@@ -84,7 +82,6 @@
     <text
      follows="right"
      font="SansSerifSmall"
-     font.color="DkGray"
      height="15"
      layout="topleft"
      left_pad="5"
-- 
cgit v1.2.3


From 1a913365b594de81de56896a9fbdfd6d8c4f21e0 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 6 Sep 2012 23:08:10 +0300
Subject: CHUI-319 FIXED ("User has said something new" text shown when
 navigating chat history with More History button)

- Added flag to chat history whether to show notification about unread messages or not
---
 indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index c837a0ee57..28ba03ebe9 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -45,6 +45,7 @@
      visible="true"
      height="310"
      name="chat_history"
+     notify_unread_msg="false"
      parse_highlights="true"
      parse_urls="true"
      left="5"
-- 
cgit v1.2.3


From 62eb7ec0301c0313cedc2fcb63df8779b22a6d26 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 6 Sep 2012 23:34:47 +0300
Subject: CHUI-318 FIXED (User cannot navigate forward in chat history viewer
 once the More History option is selected.)

- Added spinner so that user could select desired history page. Also displaying total count of pages.
---
 .../xui/en/floater_conversation_preview.xml        | 36 +++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 28ba03ebe9..d74c2c252d 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -51,14 +51,36 @@
      left="5"
      width="390">
     </chat_history>
-    <button
+    <text
      follows="bottom|right"
+     font="SansSerif"
      height="22"
      layout="topleft"
-     name="more_history"
-     label="More history..."
-     right="-15"
-     top_pad="5"
-     width="100">
-    </button>
+     name="page_label"
+     right="-110"
+     top_pad="7"
+     value="Page"
+     width="35">
+    </text>
+    <spinner
+     decimal_digits="0"
+     follows="bottom|right"
+     height="23"
+     increment="1"
+     label_width="40"
+     layout="topleft"
+     left_pad="0"
+     name="history_page_spin"
+     top_delta="-3"
+     width="50"/>
+    <text
+     follows="bottom|right"
+     font="SandSerif"
+     height="22"
+     layout="topleft"
+     name="page_num_label"
+     left_pad="5"
+     top_delta="4"
+     width="40">
+    </text>
 </floater>
-- 
cgit v1.2.3


From 385e229fae99f1e203776799f4cac6f84317d2a6 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 6 Sep 2012 12:22:09 +0300
Subject: MAINT-1183 FIXED Tooltip text is changed

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9d2978b269..63ed6cea7d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3326,7 +3326,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
-  <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
+  <string name="LocationCtrlSeeAVsTooltip">Avatars inside this parcel cannot be seen or heard by avatars outside this parcel</string>
   <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string>
   <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
-- 
cgit v1.2.3


From cc2afc1914cb4f5df0391e630cc6ab2300b1d841 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 6 Sep 2012 12:24:10 +0300
Subject: MAINT-1440 FIXED Call Tools.TakeCopy instead of
 InspectObject.TakeFreeCopy

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 63e154697b..2c420aa1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -57,7 +57,7 @@
    layout="topleft"
    name="take_copy">
     <menu_item_call.on_click
-     function="InspectObject.TakeFreeCopy"/>
+     function="Tools.TakeCopy"/>
     <menu_item_call.on_visible
       function="Tools.EnableTakeCopy"/>
   </menu_item_call>
-- 
cgit v1.2.3


From 2f53e8e72c47d6a84c757a1f78a0287c2c6a9630 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 6 Sep 2012 14:37:00 -0700
Subject: Updating the viewer to handle diffuse alpha as mode rather than a
 boolean.

---
 .../skins/default/xui/en/floater_stinson.xml       | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
index ddfbcbd0c9..b152dd5fc8 100644
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ b/indra/newview/skins/default/xui/en/floater_stinson.xml
@@ -4,7 +4,7 @@
     can_tear_off="false"
     can_resize="true"
     height="575"
-    width="1254"
+    width="1244"
     min_height="600"
     min_width="1100"
     layout="topleft"
@@ -66,7 +66,7 @@
       name="horiz_separator"
       top_pad="0"
       left="12"
-      width="1230"/>
+      width="1220"/>
   <panel
       border="false"
       bevel_style="none"
@@ -74,7 +74,7 @@
       layout="topleft"
       height="167"
       top_pad="10"
-      width="1230">
+      width="1220">
     <button
         follows="left|top"
         height="22"
@@ -93,7 +93,7 @@
         tab_stop="false"
         multi_select="true"
         name="get_scroll_list"
-        width="1230">
+        width="1220">
       <scroll_list.columns
           label="Material ID"
           name="id"
@@ -123,9 +123,9 @@
           name="alpha_mask_cutoff"
           width="110" />
       <scroll_list.columns
-          label="Is Diffuse Alpha Mask"
-          name="is_diffuse_alpha_mask"
-          width="128" />
+          label="Diffuse Alpha Mode"
+          name="diffuse_alpha_mode"
+          width="118" />
     </scroll_list>
   </panel>
   <view_border
@@ -136,7 +136,7 @@
       name="horiz_separator"
       top_pad="10"
       left="12"
-      width="1230"/>
+      width="1220"/>
   <panel
       border="false"
       bevel_style="none"
@@ -145,7 +145,7 @@
       left="12"
       top_pad="10"
       height="132"
-      width="400">
+      width="450">
     <button
         follows="left|top"
         height="22"
@@ -196,7 +196,7 @@
       name="horiz_separator"
       top_pad="10"
       left="12"
-      width="1230"/>
+      width="1220"/>
   <panel
       border="false"
       bevel_style="none"
@@ -205,7 +205,7 @@
       left="12"
       top_pad="10"
       height="132"
-      width="1230">
+      width="1220">
     <button
         follows="left|top"
         height="22"
@@ -233,7 +233,7 @@
         tab_stop="false"
         multi_select="true"
         name="post_scroll_list"
-        width="1230">
+        width="1220">
       <scroll_list.columns
           label="Material ID"
           name="id"
@@ -263,9 +263,9 @@
           name="alpha_mask_cutoff"
           width="110" />
       <scroll_list.columns
-          label="Is Diffuse Alpha Mask"
-          name="is_diffuse_alpha_mask"
-          width="128" />
+          label="Diffuse Alpha Mode"
+          name="diffuse_alpha_mode"
+          width="118" />
     </scroll_list>
   </panel>
   </floater>
-- 
cgit v1.2.3


From f015718cffb584fb78579df38aeeefee2aebb801 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Fri, 7 Sep 2012 14:00:00 -0700
Subject: MAINT-1494 : Viewer needs new localizable strings

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8e6de6ed4f..e1f61d77bc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8272,4 +8272,538 @@ Attempt cancelled.
      yestext="Yes"/>
   </notification>
 
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozen"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozenDuration"
+   persist="true"   
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouFrozeAvatar"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Avatar frozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarHasUnFrozenYou"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has unfrozen you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarUnFrozen"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Avatar unfrozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeFailure"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Freeze failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeThaw"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Your freeze expired, go about your business.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarCantFreeze"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't freeze that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NowOwnObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezOnLand"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailTooManyRequests"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Object can not be rezzed because there are too many requests.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailCantMove"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you cannot move at this time.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotAllowedOnLand"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you are not allowed on that land.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotSameRegion"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Try moving closer.  Xan't sit on object because
+it is not in the same region as you.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="NoNewObjectRegionFull"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Unable to create new object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoOwnNoGardening"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You Xan't create trees and grass on land you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyPermsNoObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransPermsNoObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddToNavMeshNoCopy"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DupeWithNoRootsSelected"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Duplicate with no root objects selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzRegionIsFull"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't duplicate objects because the region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzParcelNotFound"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't duplicate objects - Xan't find the parcel they are on.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateCuzParcelFull"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't create object because 
+the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezAttemptFailed"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Attempt to rez an object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ToxicInvRezAttemptFailed"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Unable to create item that has caused problems on this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvItemIsBlacklisted"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+That inventory item has been blacklisted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCanRezObjects"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="LandSearchBlocked"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Land Search Blocked.
+You have performed too many land searches too quickly.
+Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotEnoughResourcesToAttach"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouDiedAndGotTPHome"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You died and have been teleported to your home location
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectComingSoon"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You are no longer allowed here and have [EJECT_TIME] seconds to leave.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoEnterServerFull"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You Xan't enter this region because 
+the server is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveBackToInvDisabled"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Save Back To Inventory has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoExistNoSaveToContents"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveToContents"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSaveBackToInvDisabled"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSelCopy"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoSelCopy"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoCopy"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsNoRemoval"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveSelection"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSaveSelection"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoTaking"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezDestInternalError"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Internal Error: Unknown destination type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteFailObjNotFound"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Delete failed because object not found
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SorryCantEjectUser"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Sorry, Xan't eject that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionSezNotAHome"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomeLocationLimits"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomePositionSet"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjected"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Avatar ejected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjectFailed"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Eject failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelFull"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelPerms"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelResources"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectRegionVersion"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectNavMesh"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectWTF"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From 2b2fd9e97526d10b0b4d34154cc0a46f957acba7 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 7 Sep 2012 17:48:09 -0400
Subject: enhanced XML archetype dumping, added to per-avatar menus

---
 .../skins/default/xui/en/menu_attachment_other.xml       |  8 ++++++++
 .../skins/default/xui/en/menu_attachment_self.xml        |  8 ++++++++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml |  8 ++++++++
 indra/newview/skins/default/xui/en/menu_avatar_self.xml  | 16 ++++++++++++++++
 .../skins/default/xui/en/menu_inspect_avatar_gear.xml    |  8 ++++++++
 .../skins/default/xui/en/menu_inspect_self_gear.xml      |  8 ++++++++
 6 files changed, 56 insertions(+)
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
old mode 100644
new mode 100755
index b46b62ec4d..6f92273097
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
old mode 100644
new mode 100755
index b8128da358..84e26268bd
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -123,6 +123,14 @@ name="Edit Outfit">
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
   <menu_item_separator
   layout="topleft" />
   <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
old mode 100644
new mode 100755
index 276b5f106f..1c39984625
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
old mode 100644
new mode 100755
index d9bdfece38..0e79b0fee3
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,20 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
index 76b188220d..4fdfb2281b
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -112,6 +112,14 @@
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
   <menu_item_call
    label="Find On Map"
    name="find_on_map">
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
index 5e7b16ed4a..f935f0f312
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -249,4 +249,12 @@
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 913375051e2dbe3f1ec68d7b8b86cac613e26ec3 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 10 Sep 2012 16:12:20 +0300
Subject: CHUI-333 (Icons overlap in message panel when maximizing width of
 conversation list): increaced expanded_min_dim for the message pane

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e439fc9005..413e66738d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -113,7 +113,7 @@
          height="430"
          name="messages_layout_panel"
          width="412"
-         expanded_min_dim="205">
+         expanded_min_dim="225">
             <panel_container
              follows="all"
              height="430"
-- 
cgit v1.2.3


From d79037017e3a1627be848b9162f28ae16fcb6004 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 10 Sep 2012 16:20:47 +0300
Subject: CHUI-332 (Overlap of icons in chrome when collapsing and expanding
 conversation list) changed expanded_min_dim of the right panel

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 413e66738d..1583add857 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -36,7 +36,7 @@
          name="conversations_layout_panel"
          min_dim="38"
          width="268"
-         expanded_min_dim="120">
+         expanded_min_dim="165">
             <layout_stack
              animate="false" 
              follows="left|top|right"
-- 
cgit v1.2.3


From e10b013e4246cd276d1496ed4acc09edab0c1255 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 10 Sep 2012 18:24:45 +0300
Subject: MAINT-1515 FIXED min_height is increased to avoid overlapping

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index ea44fd493e..178987962b 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
  height="570"
  help_topic="sidebar_inventory"
  min_width="333"
- min_height="560"
+ min_height="570"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
-- 
cgit v1.2.3


From 8366efc339e7eca3918d7246b3bb7a9ba61ce765 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 10 Sep 2012 08:38:49 -0700
Subject: CHUI-283, fixed a build problem and also added a missing file.

---
 .../en/widgets/conversation_view_participant.xml   | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml

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

diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
new file mode 100755
index 0000000000..0cff25e083
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_participant
+  folder_arrow_image="ForSale_Badge"
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"
+>
+<view_profile_button
+     height="20"
+     image_overlay="Web_Profile_Off"
+     layout="topleft"
+     left_pad="5"
+     right="200"
+     name="profile_btn"
+     tab_stop="false"
+     tool_tip="View profile"
+     top_delta="-2"
+     width="20" />
+ <info_button
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     layout="topleft"
+     left_pad="3"
+     right="225"
+     name="info_btn"
+     tab_stop="false"
+     top_delta="0"
+     width="16" />
+</conversation_view_participant>
-- 
cgit v1.2.3


From be06bebffcc1a08c3018ab3712048599455e025b Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 10 Sep 2012 20:12:27 +0300
Subject: CHUI-282 WIP Modified conversation view item and IM floater container
 so that the folder view handles the positioning of items in conversations
 list.

---
 .../xui/en/panel_conversation_list_item.xml        | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_conversation_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..d1f25b45fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|top|right"
+ height="24"
+ layout="topleft"
+ mouse_opaque="flase"
+ name="conversation_list_item"
+ width="120">
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     width="20" />
+    <layout_stack
+     animate="false"
+     follows="all"
+     height="24"
+     layout="topleft"
+     left_pad="5"
+     name="caonversation_item_stack"
+     orientation="horizontal"
+     top="0"
+     width="90">
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"        
+         height="24"
+         name="call_icon_panel"
+         visible="false"
+         width="20">
+            <icon
+             height="20"
+             follows="top|right|left"
+             image_name="Conv_toolbar_hang_up"
+             layout="topleft"
+             left="0"
+             name="selected_icon"
+             top="2"
+             width="20" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         user_resize="false"
+         left_pad="0"        
+         height="24"
+         name="conversation_title_panel"
+         min_dim="50"
+         width="70"
+         expanded_min_dim="50">
+		    <text
+		     follows="left|top|right"
+		     font="SansSerifSmall"
+		     height="15"
+		     layout="topleft"
+		     left="5"
+		     name="conversation_title"
+		     parse_urls="false"
+		     top="6"
+		     use_ellipses="true"
+		     value="(loading)"
+		     width="35" />
+		    <output_monitor
+		     auto_update="true"
+		     follows="top|right"
+		     draw_border="false"
+		     height="16"
+		     layout="topleft"
+		     left_pad="5"
+		     mouse_opaque="true"
+		     name="speaking_indicator"
+		     width="20" />
+        </layout_panel>
+    </layout_stack>
+</panel>
-- 
cgit v1.2.3


From ef39011f433d93ea72cf636d4c415b468f776a01 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 10 Sep 2012 11:09:05 -0700
Subject: CHUI-283: Now displaying the speaker icon instead of the profile icon

---
 .../en/widgets/conversation_view_participant.xml   | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index 0cff25e083..0b5c1b9511 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -8,26 +8,26 @@
   mouse_opaque="true"
   follows="left|top|right"
 >
-<view_profile_button
-     height="20"
-     image_overlay="Web_Profile_Off"
-     layout="topleft"
-     left_pad="5"
-     right="200"
-     name="profile_btn"
-     tab_stop="false"
-     tool_tip="View profile"
-     top_delta="-2"
-     width="20" />
- <info_button
+<info_button
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      layout="topleft"
      left_pad="3"
-     right="225"
+     right="200"
      name="info_btn"
      tab_stop="false"
      top_delta="0"
      width="16" />
+<output_monitor
+	auto_update="true"
+	draw_border="false"
+	height="16"
+	layout="topleft"
+	left_pad="5"
+	right="225"
+	mouse_opaque="true"
+	name="speaking_indicator"
+	visible="true"
+	width="20" />	 
 </conversation_view_participant>
-- 
cgit v1.2.3


From cb8ce1141837cc450756764e03a4564f8ab0c9eb Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 11 Sep 2012 18:37:05 +0300
Subject: CHUI-336 FIXED (Remove Description label and field from Chat history
 viewer)

- Removed lineeditor and text box from code and xml
---
 .../xui/en/floater_conversation_preview.xml        | 28 ++--------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index d74c2c252d..825a88e4e1 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -14,41 +14,17 @@
      name="Title">
         CONVERSATION: [NAME]
     </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="19"
-     layout="topleft"
-     left="10"
-     name="desc txt"
-     top="22"
-     width="90">
-        Description:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     enabled="false"
-     follows="left|top|right"
-     font="SansSerif"
-     height="22"
-     layout="topleft"
-     left_pad="0"
-     max_length_bytes="127"
-     name="description"
-     width="296" />
     <chat_history
      font="SansSerifSmall"
      follows="all"
      visible="true"
-     height="310"
+     height="330"
      name="chat_history"
      notify_unread_msg="false"
      parse_highlights="true"
      parse_urls="true"
      left="5"
+     top_pad="25"
      width="390">
     </chat_history>
     <text
-- 
cgit v1.2.3


From b4866775a2acc98ebcb3986d7779eea479028ff9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 11 Sep 2012 20:57:04 -0400
Subject: Dump XML tweaks, suppress wearable updates when bakes should dominate

---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml   |  2 +-
 indra/newview/skins/default/xui/en/menu_attachment_self.xml    |  2 +-
 indra/newview/skins/default/xui/en/menu_avatar_other.xml       |  2 +-
 indra/newview/skins/default/xui/en/menu_avatar_self.xml        | 10 +---------
 .../newview/skins/default/xui/en/menu_inspect_avatar_gear.xml  |  2 +-
 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml  |  2 +-
 6 files changed, 6 insertions(+), 14 deletions(-)

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

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 6f92273097..46ba4bd29d 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -85,7 +85,7 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
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 84e26268bd..28e032ce5f 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -129,7 +129,7 @@ name="Edit Outfit">
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
   <menu_item_separator
   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 1c39984625..e7c2b80da2 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -85,7 +85,7 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
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 0e79b0fee3..c1ff026a74 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -267,14 +267,6 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
-    </menu_item_call>
-    <menu_item_call
-		 label="Dump XML"
-         name="Dump XML">
-            <menu_item_call.on_click
-             function="Advanced.AppearanceToXML" />
-            <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 4fdfb2281b..354ddc3109 100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -118,7 +118,7 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
   <menu_item_call
    label="Find On Map"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
index f935f0f312..84815caca9 100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -255,6 +255,6 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 51725b3898df96aa5819d86d1e8e7c71b47304f2 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 12 Sep 2012 14:09:13 +0300
Subject: CHUI-335 FIXED (Alpha text allowed in page spinner in chat history
 viewer)

- Added XML parameter "allow_digits_only" to spinner control widget, which disables/enables ability to input alpha text.
- Disabled ability to enter alpha text in page spinner in chat history viewer
---
 indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 825a88e4e1..0e5af67f68 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -39,6 +39,7 @@
      width="35">
     </text>
     <spinner
+     allow_digits_only="true"
      decimal_digits="0"
      follows="bottom|right"
      height="23"
-- 
cgit v1.2.3


From 8c0fcf0e391ff5db78f95f031562eedec998f164 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 13 Sep 2012 16:12:53 +0300
Subject: CHUI-321 FIXED (Indicate within the Call Log why there's nothing in
 it)

I. On "LogInstantMessages" variable set to false:
    1. save call log to file
    2. clear call log
    3. show message: "Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy."
  On "LogInstantMessages" set to true:
    1. clear message
    2. reload all saved call log entries

II. Refactored the way LLConversationLog reacts on "LogInstantMessages" value change
---
 indra/newview/skins/default/xui/en/floater_conversation_log.xml | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 9cdeb0d788..df78bbccec 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -13,6 +13,11 @@
   reuse_instance="true"
   title="CONVERSATION LOG"
   width="450">
+  
+  <string name="logging_calls_disabled">
+     Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy.
+  </string>
+  
 	<panel
       follows="left|top|right"
       height="27"
-- 
cgit v1.2.3


From 7da24ddaa3813f7b409b51ed5d330c7609b4f8a9 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 13 Sep 2012 17:00:26 +0300
Subject: CHUI-332 [Overlap of icons in chrome when collapsing and expanding
 conversation list]: force header resizing after show/hide minimize button

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 1583add857..413e66738d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -36,7 +36,7 @@
          name="conversations_layout_panel"
          min_dim="38"
          width="268"
-         expanded_min_dim="165">
+         expanded_min_dim="120">
             <layout_stack
              animate="false" 
              follows="left|top|right"
-- 
cgit v1.2.3


From 4b52515b543546844835064dfb89e5af2bbbd948 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 13 Sep 2012 20:10:45 +0300
Subject: CHUI-282 WIP Fixed conversation list items selection. Fixed
 displaying session participants only when session item is open.

---
 .../xui/en/panel_conversation_list_item.xml        | 22 +++++++++++-----------
 .../xui/en/widgets/conversation_view_session.xml   |  9 +++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index d1f25b45fe..375ea79ebe 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -3,8 +3,8 @@
  follows="left|top|right"
  height="24"
  layout="topleft"
- mouse_opaque="flase"
  name="conversation_list_item"
+ mouse_opaque="false"
  width="120">
     <avatar_icon
      follows="top|left"
@@ -12,7 +12,6 @@
      default_icon_name="Generic_Person"
      layout="topleft"
      left="5"
-     mouse_opaque="true"
      top="2"
      width="20" />
     <layout_stack
@@ -21,7 +20,8 @@
      height="24"
      layout="topleft"
      left_pad="5"
-     name="caonversation_item_stack"
+     mouse_opaque="false"
+     name="conversation_item_stack"
      orientation="horizontal"
      top="0"
      width="90">
@@ -29,6 +29,7 @@
          auto_resize="false"
          user_resize="false"        
          height="24"
+         mouse_opaque="false"
          name="call_icon_panel"
          visible="false"
          width="20">
@@ -44,13 +45,11 @@
         </layout_panel>
         <layout_panel
          auto_resize="true"
-         user_resize="false"
-         left_pad="0"        
+         user_resize="false"    
          height="24"
+         mouse_opaque="false"
          name="conversation_title_panel"
-         min_dim="50"
-         width="70"
-         expanded_min_dim="50">
+         width="70">
 		    <text
 		     follows="left|top|right"
 		     font="SansSerifSmall"
@@ -70,9 +69,10 @@
 		     height="16"
 		     layout="topleft"
 		     left_pad="5"
-		     mouse_opaque="true"
-		     name="speaking_indicator"
-		     width="20" />
+ 		     mouse_opaque="true"
+ 		     name="speaking_indicator"
+ 		     visible="false"
+ 		     width="20" />
         </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
new file mode 100644
index 0000000000..f44731ea3d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_session
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="24" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"/>
-- 
cgit v1.2.3


From 2084d33c1ec827b4e8d975a3bf1232e971f704e2 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 13 Sep 2012 11:22:41 -0700
Subject: CHUI-283: Now the information icon only appears upon mousehover. Also
 the information/speaker icon are right justified.

---
 .../default/xui/en/widgets/conversation_view_participant.xml  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index 0b5c1b9511..60015576b5 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -9,23 +9,22 @@
   follows="left|top|right"
 >
 <info_button
+	 follows="right"
+	 auto_update="true"
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      layout="topleft"
-     left_pad="3"
-     right="200"
+     right="-28"
      name="info_btn"
-     tab_stop="false"
-     top_delta="0"
      width="16" />
 <output_monitor
+	follows="right"
 	auto_update="true"
 	draw_border="false"
 	height="16"
 	layout="topleft"
-	left_pad="5"
-	right="225"
+	right="-3"
 	mouse_opaque="true"
 	name="speaking_indicator"
 	visible="true"
-- 
cgit v1.2.3


From 80ae45238b3312fd4fdf6730116341f8c1d5d6e4 Mon Sep 17 00:00:00 2001
From: LanceCorrimal <none@none>
Date: Thu, 13 Sep 2012 23:01:14 +0200
Subject: STORM-1910: Adds the count of groups and the remaining free group
 slots to the group list

---
 indra/newview/skins/default/xui/en/panel_people.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 98c7c49ff4..4383c83a5c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -434,12 +434,22 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
             <group_list
              allow_select="true" 
              follows="all"
-             height="356"
+             height="340"
              layout="topleft"
              left="3"
              name="group_list"
              top="0"
              width="307" />
+    <text
+     type="string"
+     length="1"
+     follows="left|bottom"
+     height="14"
+     layout="topleft"
+     right="-10"
+     name="groupcount">
+You belong to [COUNT] groups, and can join [REMAINING] more.
+    </text>
             <panel
              background_visible="true"
              follows="left|right|bottom"
-- 
cgit v1.2.3


From 399ba09c08d8ccaf9b34daa8b743f837639b2f35 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 14 Sep 2012 18:47:39 -0700
Subject: CHUI-283: Now the info/speaker icon are better positioned within the
 participant item. Also the participant item now matches the height of the
 session (conversation) item.

---
 .../skins/default/xui/en/widgets/conversation_view_participant.xml   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index 60015576b5..b00e8aaeee 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -2,7 +2,7 @@
 <conversation_view_participant
   folder_arrow_image="ForSale_Badge"
   folder_indentation="8"
-  item_height="20" 
+  item_height="24" 
   item_top_pad="4"
   selection_image="Rounded_Square"
   mouse_opaque="true"
@@ -10,11 +10,9 @@
 >
 <info_button
 	 follows="right"
-	 auto_update="true"
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
-     layout="topleft"
      right="-28"
      name="info_btn"
      width="16" />
@@ -23,7 +21,6 @@
 	auto_update="true"
 	draw_border="false"
 	height="16"
-	layout="topleft"
 	right="-3"
 	mouse_opaque="true"
 	name="speaking_indicator"
-- 
cgit v1.2.3


From 9b0d627a06a817fc11edc4c6c718f1114aa7cfcf Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 14 Sep 2012 19:47:52 -0700
Subject: CHUI-192 : Implement menus and settings for sorting. The sort itself
 is not performed though. Wait for CHUI-340 for this.

---
 .../skins/default/xui/en/menu_participant_view.xml | 70 ++++++++++++++++++++++
 1 file changed, 70 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index df2700c94c..0043c14479 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -2,6 +2,76 @@
 <toggleable_menu
  layout="topleft"
  name="participant_manu_view">
+    <menu_item_check
+     label="Sort conversations by type"
+     layout="topleft"
+     name="sort_sessions_by_type">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_type" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_type" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort conversations by name"
+     layout="topleft"
+     name="sort_sessions_by_name">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_name" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort conversations by recent activity"
+     layout="topleft"
+     name="sort_sessions_by_recent">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_recent" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_recent" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_check
+     label="Sort participants by name"
+     layout="topleft"
+     name="sort_participants_by_name">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_name" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort participants by recent activity"
+     layout="topleft"
+     name="sort_participants_by_recent">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_recent" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_recent" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort participants by distance from you"
+     layout="topleft"
+     name="sort_participants_by_distance">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_distance" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_distance" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
     <menu_item_call
          label="Chat preferences..."
          name="chat_preferences">
-- 
cgit v1.2.3


From 3c8407f32cf947ee1631ed66bba7a676e8b3b670 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 18 Sep 2012 12:15:51 -0700
Subject: CHUI-283: Now the avatar icon loads in the user's avatar image.Also
 the avatar image is of proper size. The participant of the conversation is
 offset correctly as well.

---
 .../newview/skins/default/xui/en/floater_pathfinding_console.xml  | 2 +-
 .../default/xui/en/widgets/conversation_view_participant.xml      | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 2629313069..79f2027c31 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -152,7 +152,7 @@
       </text>
       <check_box
           height="19"
-          label="World"
+          label="Test"
           layout="topleft"
           name="show_world"
           top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index b00e8aaeee..7ddcfe3b03 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <conversation_view_participant
   folder_arrow_image="ForSale_Badge"
-  folder_indentation="8"
+  folder_indentation="0"
   item_height="24" 
   item_top_pad="4"
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
 >
+<avatar_icon
+	 follows="left"
+     height="20"
+     default_icon_name="Generic_Person"
+     left="50"
+     width="20" />
 <info_button
 	 follows="right"
      height="16"
-- 
cgit v1.2.3


From 005cd4024794752e0cd57714656f76a8208d3105 Mon Sep 17 00:00:00 2001
From: MartinRJ Fayray <fuerholz@gmx.net>
Date: Wed, 19 Sep 2012 00:49:34 +0200
Subject: STORM-1911: Go-to line function for the internal LSL script editor

---
 .../skins/default/xui/en/floater_goto_line.xml     | 44 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_script_ed.xml       |  4 ++
 2 files changed, 48 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_goto_line.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_goto_line.xml b/indra/newview/skins/default/xui/en/floater_goto_line.xml
new file mode 100644
index 0000000000..b236888219
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_goto_line.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ default_tab_group="1"
+ height="90"
+ layout="topleft"
+ name="script goto"
+ help_topic="script_goto"
+ title="GO TO LINE"
+ width="200">
+    <button
+     height="24"
+     label="OK"
+     label_selected="OK"
+     layout="topleft"
+     left="55"
+     name="goto_btn"
+     top="53"
+     width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="txt"
+     top="21"
+     width="65">
+        Go to line
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="75"
+     max_length_bytes="9"
+     name="goto_line"
+     tab_group="1"
+     top="21"
+     width="85" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index f6a8af0973..8b2a6692d9 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -125,6 +125,10 @@
              label="Search / Replace..."
              layout="topleft"
              name="Search / Replace..." />
+            <menu_item_call
+             label="Go to line..."
+             layout="topleft"
+             name="Go to line..." />
         </menu>
         <menu
          top="0"
-- 
cgit v1.2.3


From fcb010e835d9b894ba6d1012ac8e3a85c5ab3400 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 19 Sep 2012 19:20:21 +0300
Subject: CHUI-338 FIXED (LLAvatarNameResponder warning shown in debug console
 when using spinner to page through chat history viewer)

- Trying to restore avatarID by its name before appending message to chat history.
- Also prevented requesting avatar name by null LLUUID in LLAvatarIconCtrl::setValue
---
 indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 0e5af67f68..6f1ddaaf4f 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -52,7 +52,7 @@
      width="50"/>
     <text
      follows="bottom|right"
-     font="SandSerif"
+     font="SansSerif"
      height="22"
      layout="topleft"
      name="page_num_label"
-- 
cgit v1.2.3


From 6762162fba886cf5da032f1b30db02bf95703990 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Thu, 20 Sep 2012 11:19:51 -0700
Subject: MAINT-1589 - Update debit permissions dialog (residents deemed
 frightening). Removed sentence as per jira.   Also removed "persist" tag from
 new localized alert strings since they shouldn't persist.

---
 .../newview/skins/default/xui/en/notifications.xml | 60 +---------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e1f61d77bc..fc40c7d745 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6764,7 +6764,7 @@ Is this OK?
    type="notify">
 Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
   
-It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account.
+Do not allow access if you do not fully understand why it wants access to your account.
 
   <tag>confirm</tag>
     <form name="form">
@@ -8276,7 +8276,6 @@ Attempt cancelled.
   <notification
    icon="alertmodal.tga"
    name="AvatarFrozen"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 [AV_FREEZER] has frozen you. You cannot move or interact with the world.
@@ -8285,7 +8284,6 @@ Attempt cancelled.
   <notification
    icon="alertmodal.tga"
    name="AvatarFrozenDuration"
-   persist="true"   
    type="notify">
    <tag>fail</tag>
 [AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
@@ -8294,7 +8292,6 @@ Attempt cancelled.
   <notification
    icon="alertmodal.tga"
    name="YouFrozeAvatar"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Avatar frozen.
@@ -8303,7 +8300,6 @@ Avatar frozen.
   <notification
    icon="alertmodal.tga"
    name="AvatarHasUnFrozenYou"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 [AV_FREEZER] has unfrozen you.
@@ -8312,7 +8308,6 @@ Avatar frozen.
   <notification
    icon="alertmodal.tga"
    name="AvatarUnFrozen"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Avatar unfrozen.
@@ -8321,7 +8316,6 @@ Avatar unfrozen.
   <notification
    icon="alertmodal.tga"
    name="AvatarFreezeFailure"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Freeze failed because you don't have admin permission for that parcel.
@@ -8330,7 +8324,6 @@ Freeze failed because you don't have admin permission for that parcel.
   <notification
    icon="alertmodal.tga"
    name="AvatarFreezeThaw"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Your freeze expired, go about your business.
@@ -8339,7 +8332,6 @@ Your freeze expired, go about your business.
   <notification
    icon="alertmodal.tga"
    name="AvatarCantFreeze"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Sorry, can't freeze that user.
@@ -8348,7 +8340,6 @@ Sorry, can't freeze that user.
   <notification
    icon="alertmodal.tga"
    name="NowOwnObject"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You are now the owner of object [OBJECT_NAME]
@@ -8357,7 +8348,6 @@ You are now the owner of object [OBJECT_NAME]
   <notification
    icon="alertmodal.tga"
    name="CantRezOnLand"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
@@ -8366,7 +8356,6 @@ Xan't rez object at [OBJECT_POS] because the owner of this land does not allow i
   <notification
    icon="alertmodal.tga"
    name="RezFailTooManyRequests"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Object can not be rezzed because there are too many requests.
@@ -8375,7 +8364,6 @@ Object can not be rezzed because there are too many requests.
   <notification
    icon="alertmodal.tga"
    name="SitFailCantMove"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You cannot sit because you cannot move at this time.
@@ -8384,7 +8372,6 @@ You cannot sit because you cannot move at this time.
   <notification
    icon="alertmodal.tga"
    name="SitFailNotAllowedOnLand"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You cannot sit because you are not allowed on that land.
@@ -8393,7 +8380,6 @@ You cannot sit because you are not allowed on that land.
   <notification
    icon="alertmodal.tga"
    name="SitFailNotSameRegion"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Try moving closer.  Xan't sit on object because
@@ -8403,7 +8389,6 @@ it is not in the same region as you.
   <notification
    icon="alertmodal.tga"
    name="NoNewObjectRegionFull"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Unable to create new object. The region is full.
@@ -8412,7 +8397,6 @@ Unable to create new object. The region is full.
   <notification
    icon="alertmodal.tga"
    name="FailedToPlaceObject"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Failed to place object at specified location.  Please try again.
@@ -8421,7 +8405,6 @@ Failed to place object at specified location.  Please try again.
   <notification
    icon="alertmodal.tga"
    name="NoOwnNoGardening"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You Xan't create trees and grass on land you don't own.
@@ -8430,7 +8413,6 @@ You Xan't create trees and grass on land you don't own.
   <notification
    icon="alertmodal.tga"
    name="NoCopyPermsNoObject"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
@@ -8439,7 +8421,6 @@ Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
   <notification
    icon="alertmodal.tga"
    name="NoTransPermsNoObject"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
@@ -8448,7 +8429,6 @@ Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
   <notification
    icon="alertmodal.tga"
    name="AddToNavMeshNoCopy"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
@@ -8457,7 +8437,6 @@ Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
   <notification
    icon="alertmodal.tga"
    name="DupeWithNoRootsSelected"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Duplicate with no root objects selected.
@@ -8466,7 +8445,6 @@ Duplicate with no root objects selected.
   <notification
    icon="alertmodal.tga"
    name="CantDupeCuzRegionIsFull"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't duplicate objects because the region is full.
@@ -8475,7 +8453,6 @@ Xan't duplicate objects because the region is full.
   <notification
    icon="alertmodal.tga"
    name="CantDupeCuzParcelNotFound"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't duplicate objects - Xan't find the parcel they are on.
@@ -8484,7 +8461,6 @@ Xan't duplicate objects - Xan't find the parcel they are on.
   <notification
    icon="alertmodal.tga"
    name="CantCreateCuzParcelFull"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't create object because 
@@ -8494,7 +8470,6 @@ the parcel is full.
   <notification
    icon="alertmodal.tga"
    name="RezAttemptFailed"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Attempt to rez an object failed.
@@ -8503,7 +8478,6 @@ Attempt to rez an object failed.
   <notification
    icon="alertmodal.tga"
    name="ToxicInvRezAttemptFailed"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Unable to create item that has caused problems on this region.
@@ -8512,7 +8486,6 @@ Unable to create item that has caused problems on this region.
   <notification
    icon="alertmodal.tga"
    name="InvItemIsBlacklisted"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 That inventory item has been blacklisted.
@@ -8521,7 +8494,6 @@ That inventory item has been blacklisted.
   <notification
    icon="alertmodal.tga"
    name="NoCanRezObjects"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You are not currently allowed to create objects.
@@ -8530,7 +8502,6 @@ You are not currently allowed to create objects.
   <notification
    icon="alertmodal.tga"
    name="LandSearchBlocked"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Land Search Blocked.
@@ -8541,7 +8512,6 @@ Please try again in a minute.
   <notification
    icon="alertmodal.tga"
    name="NotEnoughResourcesToAttach"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Not enough script resources available to attach object!
@@ -8550,7 +8520,6 @@ Not enough script resources available to attach object!
   <notification
    icon="alertmodal.tga"
    name="YouDiedAndGotTPHome"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You died and have been teleported to your home location
@@ -8559,7 +8528,6 @@ You died and have been teleported to your home location
   <notification
    icon="alertmodal.tga"
    name="EjectComingSoon"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You are no longer allowed here and have [EJECT_TIME] seconds to leave.
@@ -8568,7 +8536,6 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave.
   <notification
    icon="alertmodal.tga"
    name="NoEnterServerFull"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You Xan't enter this region because 
@@ -8578,7 +8545,6 @@ the server is full.
   <notification
    icon="alertmodal.tga"
    name="SaveBackToInvDisabled"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Save Back To Inventory has been disabled.
@@ -8587,7 +8553,6 @@ Save Back To Inventory has been disabled.
   <notification
    icon="alertmodal.tga"
    name="NoExistNoSaveToContents"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
@@ -8596,7 +8561,6 @@ Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed fro
   <notification
    icon="alertmodal.tga"
    name="NoModNoSaveToContents"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
@@ -8605,7 +8569,6 @@ Cannot save '[OBJ_NAME]' to object contents because you do not have permission t
   <notification
    icon="alertmodal.tga"
    name="NoSaveBackToInvDisabled"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
@@ -8614,7 +8577,6 @@ Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
   <notification
    icon="alertmodal.tga"
    name="NoCopyNoSelCopy"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
@@ -8623,7 +8585,6 @@ You cannot copy your selection because you do not have permission to copy the ob
   <notification
    icon="alertmodal.tga"
    name="NoTransNoSelCopy"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
@@ -8632,7 +8593,6 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
   <notification
    icon="alertmodal.tga"
    name="NoTransNoCopy"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
@@ -8641,7 +8601,6 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
   <notification
    icon="alertmodal.tga"
    name="NoPermsNoRemoval"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
@@ -8650,7 +8609,6 @@ Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permi
   <notification
    icon="alertmodal.tga"
    name="NoModNoSaveSelection"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
@@ -8659,7 +8617,6 @@ Cannot save your selection because you do not have permission to modify the obje
   <notification
    icon="alertmodal.tga"
    name="NoCopyNoSaveSelection"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
@@ -8668,7 +8625,6 @@ Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
   <notification
    icon="alertmodal.tga"
    name="NoModNoTaking"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
@@ -8677,7 +8633,6 @@ You cannot take your selection because you do not have permission to modify the
   <notification
    icon="alertmodal.tga"
    name="RezDestInternalError"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Internal Error: Unknown destination type.
@@ -8686,7 +8641,6 @@ Internal Error: Unknown destination type.
   <notification
    icon="alertmodal.tga"
    name="DeleteFailObjNotFound"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Delete failed because object not found
@@ -8695,7 +8649,6 @@ Delete failed because object not found
   <notification
    icon="alertmodal.tga"
    name="SorryCantEjectUser"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Sorry, Xan't eject that user.
@@ -8704,7 +8657,6 @@ Sorry, Xan't eject that user.
   <notification
    icon="alertmodal.tga"
    name="RegionSezNotAHome"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 This region does not allow you to set your home location here.
@@ -8713,7 +8665,6 @@ This region does not allow you to set your home location here.
   <notification
    icon="alertmodal.tga"
    name="HomeLocationLimits"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 You can only set your 'Home Location' on your land or at a mainland Infohub.
@@ -8722,7 +8673,6 @@ You can only set your 'Home Location' on your land or at a mainland Infohub.
   <notification
    icon="alertmodal.tga"
    name="HomePositionSet"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Home position set.
@@ -8731,7 +8681,6 @@ Home position set.
   <notification
    icon="alertmodal.tga"
    name="AvatarEjected"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Avatar ejected.
@@ -8740,7 +8689,6 @@ Avatar ejected.
   <notification
    icon="alertmodal.tga"
    name="AvatarEjectFailed"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Eject failed because you don't have admin permission for that parcel.
@@ -8749,7 +8697,6 @@ Eject failed because you don't have admin permission for that parcel.
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectParcelFull"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't move object '[OBJECT_NAME]' to
@@ -8759,7 +8706,6 @@ Xan't move object '[OBJECT_NAME]' to
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectParcelPerms"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't move object '[OBJECT_NAME]' to
@@ -8769,7 +8715,6 @@ Xan't move object '[OBJECT_NAME]' to
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectParcelResources"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't move object '[OBJECT_NAME]' to
@@ -8779,7 +8724,6 @@ Xan't move object '[OBJECT_NAME]' to
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectRegionVersion"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't move object '[OBJECT_NAME]' to
@@ -8789,7 +8733,6 @@ Xan't move object '[OBJECT_NAME]' to
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectNavMesh"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't move object '[OBJECT_NAME]' to
@@ -8799,7 +8742,6 @@ Xan't move object '[OBJECT_NAME]' to
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectWTF"
-   persist="true"
    type="notify">
    <tag>fail</tag>
 Xan't move object '[OBJECT_NAME]' to
-- 
cgit v1.2.3


From dcd9831a1c9a58233f19c9b4f0e66a67faafb8a4 Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Thu, 20 Sep 2012 22:38:12 +0000
Subject: [MAINT-1562] Convert more hard-coded alert messages to be localized

Related chagesets:
http://hg.lindenlab.com/baker/honeybadger/changeset/74c398c712b6

Description:
- Updated english notifications.xml with alerts from the related changeset above.
---
 .../newview/skins/default/xui/en/notifications.xml | 1117 +++++++++++++++++++-
 1 file changed, 1111 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fc40c7d745..eb901130d3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8699,7 +8699,7 @@ Eject failed because you don't have admin permission for that parcel.
    name="CantMoveObjectParcelFull"
    type="notify">
    <tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
   </notification>
 
@@ -8708,7 +8708,7 @@ Xan't move object '[OBJECT_NAME]' to
    name="CantMoveObjectParcelPerms"
    type="notify">
    <tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
   </notification>
 
@@ -8717,7 +8717,7 @@ Xan't move object '[OBJECT_NAME]' to
    name="CantMoveObjectParcelResources"
    type="notify">
    <tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
   </notification>
 
@@ -8726,7 +8726,7 @@ Xan't move object '[OBJECT_NAME]' to
    name="CantMoveObjectRegionVersion"
    type="notify">
    <tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
   </notification>
 
@@ -8735,7 +8735,7 @@ Xan't move object '[OBJECT_NAME]' to
    name="CantMoveObjectNavMesh"
    type="notify">
    <tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
   </notification>
 
@@ -8744,8 +8744,1113 @@ Xan't move object '[OBJECT_NAME]' to
    name="CantMoveObjectWTF"
    type="notify">
    <tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PhantomWithConcavePiece"
+   type="notify">
+   <tag>fail</tag>
+This object cannot have a concave piece because it is phantom and contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to add item!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableEditItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToCopyInventory"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to copy that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemDoesntExist"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemAlreadyExists"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item with that name already exists in inventory
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveModifyAttachment"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: This would modify the attachment permissions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Too many scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddScript"
+   type="notify">
+   <tag>fail</tag>
+Unable to add script!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AssetServerTimeoutObjReturn"
+   type="notify">
+   <tag>fail</tag>
+Asset server didn't respond in a timely fashion.  Object returned to sim.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisablePhysicsShapes"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics shapes enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+You cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetPhysicsPropertiesOnObjectType"
+   type="notify">
+   <tag>fail</tag>
+Cannot set physics properties on that object type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetRootPrimWithNoShape"
+   type="notify">
+   <tag>fail</tag>
+Cannot set root prim to have no shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoRegionSupportPhysMats"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics materials enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OnlyRootPrimPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Only root prims may have their physics materials adjusted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportCharacterPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Setting physics materials on characters is not yet supported.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidPhysMatProperty"
+   type="notify">
+   <tag>fail</tag>
+One or more of the specified physics material properties was invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterStitchingMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the stitching type of a mesh object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterShapeMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the shape of a mesh object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FullRegionCantEnter"
+   type="notify">
+   <tag>fail</tag>
+You can't enter this region because \nthe region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedOwnersDiffer"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- owners differ
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Link failed because you do not have edit permission.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPrims"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many primitives
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedCantLinkNoCopyNoTrans"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot link no-copy with no-transfer
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNothingLinkable"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- nothing linkable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPathfindingChars"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many pathfinding characters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedInsufficientLand"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- insufficient land resources
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooMuchPhysics"
+   type="notify">
+   <tag>fail</tag>
+Object uses too many physics resources -- its dynamics have been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportAgentByObjectWithParcelInfo"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object ... on the parcel ...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportAgentByObject"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object ... on the parcel ...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttackMultipleObjOneSpot"
+   type="notify">
+   <tag>fail</tag>
+You can't attach multiple objects to one spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateMultipleObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+You can't create multiple objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjTimeOut"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Object is missing from database.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjUnknown"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The request timed out. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjMissingFromDB"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailureTookTooLong"
+   type="notify">
+   <tag>fail</tag>
+Rez failed, requested object took too long to load.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreatePlantsOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot create plants on this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRestoreObjectNoWorldPos"
+   type="notify">
+   <tag>fail</tag>
+Cannot restore object. No world position found.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectInvalidMeshData"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because its mesh data is invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectTooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because there are already too many scripts in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectNoAccess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to create objects there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObject"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidObjectParams"
+   type="notify">
+   <tag>fail</tag>
+Invalid object parameters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDuplicateObjectNoAcess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to duplicate objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantChangeShape"
+   type="notify">
+   <tag>fail</tag>
+You are not allowed to change this shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoAccessToClaimObjects"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to claim objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedFailedNoPermToDeedForGroup"
+   type="notify">
+   <tag>fail</tag>
+Deed failed because you do not have permission to deed objects for your group.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPrivsToBuyObject"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to buy objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectAvatarSittingOnIt"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because an avatar is sitting on it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WhyAreYouTryingToWearShrubbery"
+   type="notify">
+   <tag>fail</tag>
+Trees and grasses cannot be worn as attachments.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachGroupOwnedObjs"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach group-owned objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectsNotOwned"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNavmeshObjects"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that contribute to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectNoMovePermissions"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because you do not have permission to move it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNotEnoughScriptResources"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropItemTrialUser"
+   type="notify">
+   <tag>fail</tag>
+You can't drop objects here; try the Free Trial area.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropMeshAttachment"
+   type="notify">
+   <tag>fail</tag>
+You can't drop mesh attachments. Detach to inventory and then rez in world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: you don't have permission to drop there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientLandResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: insufficient available land resource.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachments: insufficient available resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropObjectFullParcel"
+   type="notify">
+   <tag>fail</tag>
+Cannot drop object here.  Parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTouchObjectBannedFromParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't touch/grab this object because you are banned from the land parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PlzNarrowDeleteParams"
+   type="notify">
+   <tag>fail</tag>
+Please narrow your delete parameters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToUploadAsset"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload asset.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTeleportCouldNotFindUser"
+   type="notify">
+   <tag>fail</tag>
+Could not find user to teleport home
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodlikeRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+godlike request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+generic request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantUploadPostcard"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload postcard.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFetchInventoryForGroupNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to fetch inventory details for the group notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeNotPermitted"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- not permitted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeCantConstructInventory"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- could not construct inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantParceInventoryInNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to parse inventory in notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainUploadFailed"
+   type="notify">
+   <tag>fail</tag>
+Terrain upload failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWritten"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWrittenStartingDownload"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written, starting download...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainBaked"
+   type="notify">
+   <tag>fail</tag>
+Terrain baked.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TenObjectsDisabledPlzRefresh"
+   type="notify">
+   <tag>fail</tag>
+Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UpdateViewerBuyParcel"
+   type="notify">
+   <tag>fail</tag>
+You need to update your viewer to buy this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked"
+   type="notify">
+   <tag>fail</tag>
+You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, this parcel is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuySalePriceOrLandAreaChanged"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, the sale price or land area has changed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotAuthorized"
+   type="notify">
+   <tag>fail</tag>
+You are not the authorized buyer for this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelAwaitingPurchaseAuth"
+   type="notify">
+   <tag>fail</tag>
+You cannot purchase this parcel because it is already awaiting purchase aut
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuildOverflowParcel"
+   type="notify">
+   <tag>fail</tag>
+You cannot build objects here because doing so would overflow the parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SelectedMultipleOwnedLand"
+   type="notify">
+   <tag>fail</tag>
+You selected land with different owners. Please select a smaller area and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantJoinTooFewLeasedParcels"
+   type="notify">
+   <tag>fail</tag>
+Not enough leased parcels in selection to join.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandMultipleParcelsSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandCantFindParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandWholeParcelSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandHasBeenDivided"
+   type="notify">
+   <tag>fail</tag>
+Land has been divided.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PassPurchased"
+   type="notify">
+   <tag>fail</tag>
+You purchased a pass.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisallowsClassifieds"
+   type="notify">
+   <tag>fail</tag>
+Region does not allow classified advertisements.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandPassExpireSoon"
+   type="notify">
+   <tag>fail</tag>
+Your pass to this land is about to expire.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoSuitableSurface"
+   type="notify">
+   <tag>fail</tag>
+There is no suitable surface to sit on, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoRoom"
+   type="notify">
+   <tag>fail</tag>
+No room to sit here, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AutopilotCanceled"
+   type="notify">
+   <tag>fail</tag>
+Autopilot canceled
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have permission
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDeedGroupLand"
+   type="notify">
+   <tag>fail</tag>
+Cannot deed group-owned land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyInventoryFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy inventory failed because you do not have enough L$
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyPassFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+You don't have enough L$ to buy a pass to this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyPassTryAgain"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy pass right now.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because \nthe parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedPlacingObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmarkForEvent"
+   type="notify">
+   <tag>fail</tag>
+Unable to create landmark for event.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodBeatsFreeze"
+   type="notify">
+   <tag>fail</tag>
+Your godlike powers break the freeze!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpecialPowersRequestFailedLogged"
+   type="notify">
+   <tag>fail</tag>
+Request for special powers failed. This request has been logged.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExpireExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is currently unable to process your request. The request timed out.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DieExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is unable to process your request.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddPrimitiveFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create primitve.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezObjectFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResetHomePositionNotLegal"
+   type="notify">
+   <tag>fail</tag>
+Reset Home position since Home wasn't legal.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantInviteRegionFull"
+   type="notify">
+   <tag>fail</tag>
+You cannot currently invite anyone to your location because the region is full. Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSetHomeAtRegion"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ListValidHomeLocations"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetHomePosition"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDerezInventoryError"
+   type="notify">
+   <tag>fail</tag>
+Cannot derez object due to inventory fault.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInv"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInvFolder"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory folder.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateInventory"
+   type="notify">
+   <tag>fail</tag>
+Cannot create that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmark"
+   type="notify">
+   <tag>fail</tag>
+Cannot create landmark.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateOutfit"
+   type="notify">
+   <tag>fail</tag>
+Cannot create outfit right now. Try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Inventory is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindInvItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to find inventory item.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindObject"
+   type="notify">
+   <tag>fail</tag>
+Unable to find object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTransfterMoneyRegionDisabled"
+   type="notify">
+   <tag>fail</tag>
+Money transfers to objects are currently disabled in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantPayNoAgent"
+   type="notify">
+   <tag>fail</tag>
+Could not figure out who to pay.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDonateToPublicObjects"
+   type="notify">
+   <tag>fail</tag>
+You cannot give L$ to public objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryCreationInWorldObjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Inventory creation on in-world object failed.
+  </notification>
+
+
 </notifications>
-- 
cgit v1.2.3


From 381c13d0e51c3c054fdf2afeff8a8bcb6fc7aa11 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 20 Sep 2012 16:12:28 -0700
Subject: CHUI-283: Refactor of how the layout is determined for
 LLFolderViewItem. Changed constant members that defined the layout to
 non-const member varaibles, which are populated using a .xml file.

---
 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml |  9 ++++++++-
 .../default/xui/en/widgets/conversation_view_participant.xml  | 11 +++++++++--
 .../default/xui/en/widgets/conversation_view_session.xml      |  9 ++++++++-
 .../newview/skins/default/xui/en/widgets/folder_view_item.xml |  8 +++++++-
 .../skins/default/xui/en/widgets/inbox_folder_view_folder.xml |  8 +++++++-
 5 files changed, 39 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index 203febbf18..c80e5b168a 100644
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -20,6 +20,13 @@
               folder_indentation="8"
               item_height="20"
               item_top_pad="4"
-              selection_image="Rounded_Square"/>
+              selection_image="Rounded_Square"
+              left_pad="5"
+              icon_pad="2"
+              icon_width="16"
+              text_pad="1"
+              text_pad_right="4"
+              arrow_size="12"
+              max_folder_item_overlap="2"/>
       <item allow_open="false"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index 7ddcfe3b03..a28d6e0209 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <conversation_view_participant
-  folder_arrow_image="ForSale_Badge"
+  folder_arrow_image="Folder_Arrow"
   folder_indentation="0"
   item_height="24" 
-  item_top_pad="4"
+  item_top_pad="0"
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
+  left_pad="0"
+  icon_pad="10"
+  icon_width="20"
+  text_pad="7"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"
 >
 <avatar_icon
 	 follows="left"
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
index f44731ea3d..b8c39eec1d 100644
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -6,4 +6,11 @@
   item_top_pad="4"
   selection_image="Rounded_Square"
   mouse_opaque="true"
-  follows="left|top|right"/>
+  follows="left|top|right"
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index 6fa74f403d..bbd53ccb12 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -7,4 +7,10 @@
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
-  />
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 77d8024cb2..590a4730a9 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -5,7 +5,13 @@
   item_height="20" 
   item_top_pad="4"
   selection_image="Rounded_Square"
-  >
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2">
 	<new_badge 
         label="New" 
         label_offset_horiz="-1"
-- 
cgit v1.2.3


From 9ddfb75551056dc9c02815877fbbb00d8c9be8ca Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Thu, 20 Sep 2012 16:23:45 -0700
Subject: Fix up messages altered for testing

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index eb901130d3..7a03239d0c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8350,7 +8350,7 @@ You are now the owner of object [OBJECT_NAME]
    name="CantRezOnLand"
    type="notify">
    <tag>fail</tag>
-Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
+Can't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
   </notification>
 
   <notification
@@ -8382,7 +8382,7 @@ You cannot sit because you are not allowed on that land.
    name="SitFailNotSameRegion"
    type="notify">
    <tag>fail</tag>
-Try moving closer.  Xan't sit on object because
+Try moving closer.  Can't sit on object because
 it is not in the same region as you.
   </notification>
   
@@ -8407,7 +8407,7 @@ Failed to place object at specified location.  Please try again.
    name="NoOwnNoGardening"
    type="notify">
    <tag>fail</tag>
-You Xan't create trees and grass on land you don't own.
+You Can't create trees and grass on land you don't own.
   </notification>
 
   <notification
@@ -8447,7 +8447,7 @@ Duplicate with no root objects selected.
    name="CantDupeCuzRegionIsFull"
    type="notify">
    <tag>fail</tag>
-Xan't duplicate objects because the region is full.
+Can't duplicate objects because the region is full.
   </notification>
 
   <notification
@@ -8455,7 +8455,7 @@ Xan't duplicate objects because the region is full.
    name="CantDupeCuzParcelNotFound"
    type="notify">
    <tag>fail</tag>
-Xan't duplicate objects - Xan't find the parcel they are on.
+Can't duplicate objects - Can't find the parcel they are on.
   </notification>
 
   <notification
@@ -8463,7 +8463,7 @@ Xan't duplicate objects - Xan't find the parcel they are on.
    name="CantCreateCuzParcelFull"
    type="notify">
    <tag>fail</tag>
-Xan't create object because 
+Can't create object because 
 the parcel is full.
   </notification>
 
@@ -8538,7 +8538,7 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave.
    name="NoEnterServerFull"
    type="notify">
    <tag>fail</tag>
-You Xan't enter this region because 
+You can't enter this region because 
 the server is full.
   </notification>
 
@@ -8651,7 +8651,7 @@ Delete failed because object not found
    name="SorryCantEjectUser"
    type="notify">
    <tag>fail</tag>
-Sorry, Xan't eject that user.
+Sorry, can't eject that user.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 6dd2bf36c52fa00732ed5a3910539f38c91ff173 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 21 Sep 2012 15:27:46 -0700
Subject: CHUI-283: Now the speaker/info icon positions are set based upon
 visibility.'

---
 .../skins/default/xui/en/widgets/conversation_view_participant.xml      | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index a28d6e0209..0024decd4c 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -19,7 +19,9 @@
 	 follows="left"
      height="20"
      default_icon_name="Generic_Person"
+	 layout="topleft"
      left="50"
+	 top="2"
      width="20" />
 <info_button
 	 follows="right"
-- 
cgit v1.2.3


From 05bae4d6d78de8165eca397493ce9d0156e3ad12 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 24 Sep 2012 13:27:50 +0300
Subject: CHUI-124 FIXED Tooltips for buttons are added

---
 .../skins/default/xui/en/panel_block_list_sidetray.xml   |  4 ++++
 indra/newview/skins/default/xui/en/panel_people.xml      | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 24f7d44cce..53d0252215 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -43,6 +43,7 @@
           menu_filename="menu_people_blocked_gear.xml"
           menu_position="bottomleft"
           name="blocked_gear_btn"
+          tool_tip="Actions on selected person or object"
           top="3"
           width="31" />
          <menu_button
@@ -57,6 +58,7 @@
           menu_filename="menu_people_blocked_view.xml"
           menu_position="bottomleft"
           name="view_btn"
+          tool_tip="Sort options"
           top_delta="0"
           width="31" />
          <menu_button
@@ -71,6 +73,7 @@
           menu_filename="menu_people_blocked_plus.xml"
           menu_position="bottomleft"
           name="plus_btn"
+          tool_tip="Pick a Resident or an object to block"
           top_delta="0"
           width="31"/>
           <button
@@ -83,6 +86,7 @@
           left_pad="2"
           layout="topleft"
           name="unblock_btn"
+          tool_tip="Remove Resident or object from blocked list"
           top_delta="0"
           width="31"/>
      </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 09156b41b5..7433ad828d 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -116,6 +116,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="7"
                  name="gear_btn"
+                 tool_tip="Actions on selected person"
                  top="3"
                  width="31" />
                 <menu_button
@@ -130,6 +131,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_nearby_view.xml"
                  menu_position="bottomleft"
                  name="nearby_view_btn"
+                 tool_tip="View/sort options"
                  top_delta="0"
                  width="31" />
                 <button
@@ -142,6 +144,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="add_friend_btn"
+                 tool_tip="Offer friendship to a resident"
                  top_delta="0"
                  width="31">
                     <commit_callback
@@ -158,6 +161,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="nearby_del_btn"
+                 tool_tip="Remove selected person as a friend"
                  top_delta="0"
                  width="31">
                     <commit_callback
@@ -264,6 +268,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="8"
                  name="gear_btn"
+                 tool_tip="Actions on selected person"
                  top="3"
                  width="31" />
                 <menu_button
@@ -278,6 +283,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_friends_view.xml"
                  menu_position="bottomleft"
                  name="friends_view_btn"
+                 tool_tip="View/sort options"
                  top_delta="0"
                  width="31" />
                 <button
@@ -290,6 +296,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="friends_add_btn"
+                 tool_tip="Offer friendship to a resident"
                  top_delta="0"
                  width="31">
                     <commit_callback
@@ -305,6 +312,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="friends_del_btn"
+                 tool_tip="Remove selected person as a friend"
                  top_delta="0"
                  width="31">
                     <commit_callback
@@ -419,6 +427,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="8"
                  name="groups_gear_btn"
+                 tool_tip="Actions on selected group"
                  top="3"
                  width="31" />
                 <menu_button
@@ -433,6 +442,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_groups_view.xml"
                  menu_position="bottomleft"
                  name="groups_view_btn"
+                 tool_tip="View/sort options"
                  top_delta="0"
                  width="31" />
                 <menu_button
@@ -447,6 +457,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_group_plus.xml"
                  menu_position="bottomleft"
                  name="plus_btn"
+                 tool_tip="Join group/Create new group"
                  top_delta="0"
                  width="31">
                     <validate_callback
@@ -462,6 +473,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="minus_btn"
+                 tool_tip="Leave selected group"
                  top_delta="0"
                  width="31">
                     <commit_callback
@@ -527,6 +539,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="8"
                  name="gear_btn"
+                 tool_tip="Actions on selected person"
                  top="3"
                  width="31" />
                 <menu_button
@@ -541,6 +554,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  menu_filename="menu_people_recent_view.xml"
                  menu_position="bottomleft"
                  name="recent_view_btn"
+                 tool_tip="View/sort options"
                  top_delta="0"
                  width="31" />
                 <button
@@ -553,6 +567,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  layout="topleft"
                  left_pad="2"
                  name="add_friend_btn"
+                 tool_tip="Offer friendship to a resident"
                  top_delta="0"
                  width="31">
                     <commit_callback
@@ -569,6 +584,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  left_pad="2"
                  layout="topleft"
                  name="recent_del_btn"
+                 tool_tip="Remove selected person as a friend"
                  top_delta="0"
                  width="31">
                     <commit_callback
-- 
cgit v1.2.3


From e0b252fc99968eb54031a8a2bb8216baae5078b2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 24 Sep 2012 14:52:20 +0300
Subject: CHUI-123 FIXED Tooltips for buttons are added

---
 indra/newview/skins/default/xui/en/floater_im_container.xml |  4 +++-
 indra/newview/skins/default/xui/en/floater_im_session.xml   | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 413e66738d..d23ff28fd0 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -62,6 +62,7 @@
                      layout="topleft"
                      left="10"
                      name="sort_btn"
+                     tool_tip="View/sort options"
                      top="5"
                      width="31" />
                     <button
@@ -75,7 +76,7 @@
                      top="5"
                      left_pad="4"
                      name="add_btn"
-                     tool_tip="Add button on the left panel"
+                     tool_tip="Start a new conversation"
                      width="31"/>
                 </layout_panel>
                 <layout_panel
@@ -94,6 +95,7 @@
                      top="5"
                      left="5"
                      name="expand_collapse_btn"
+                     tool_tip="Collapse/Expand this list"
                      width="31" />
                 </layout_panel>
             </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d6d48130ab..5c74f7f9bb 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -37,6 +37,12 @@
     <floater.string
      name="multiple_participants_added"
      value="[NAME] were invited to the conversation."/>
+     <floater.string
+     name="tooltip_to_separate_window"
+     value="Move this conversation to a separate window"/>
+     <floater.string
+     name="tooltip_to_main_window"
+     value="Move this conversation back to main window"/>
     <view
         follows="all"
         layout="topleft"
@@ -64,6 +70,7 @@
                  layout="topleft"
                  left="5"
                  name="view_options_btn"
+                 tool_tip="View/sort options"
                  top="5"
                  width="31" />
              <button
@@ -78,6 +85,7 @@
                  top="5"
                  left_pad="4"
                  name="add_btn"
+                 tool_tip="Add someone to this conversation"
                  width="31"/>
              <button
                  follows="top|left"
@@ -90,6 +98,7 @@
                  top="5"
                  left_pad="4"
                  name="voice_call_btn"
+                 tool_tip="Open voice connection"
                  width="31"/>
              <button
                  follows="right|top"
@@ -102,6 +111,7 @@
                  top="5"
                  left="283"
                  name="close_btn"
+                 tool_tip="End this conversation"
                  width="31" />
              <button
                  follows="right|top"
@@ -114,6 +124,7 @@
                  top="5"
                  left_pad="5"
                  name="expand_collapse_btn"
+                 tool_tip="Collapse/Expand this pane"
                  width="31" />
              <button
                  follows="right|top"
-- 
cgit v1.2.3


From cc342c1afc4a63caaffdfc6397d0c237e90d6194 Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Mon, 24 Sep 2012 18:04:10 +0000
Subject: Converted more hard-coded strings

---
 .../newview/skins/default/xui/en/notifications.xml | 118 ++++++++++++++++++++-
 1 file changed, 113 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7a03239d0c..8c3cdccbdb 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8750,12 +8750,45 @@ Can't move object '[OBJECT_NAME]' to
 
   <notification
    icon="alertmodal.tga"
-   name="PermModifyObject"
+   name="NoPermModifyObject"
    type="notify">
    <tag>fail</tag>
 You don't have permission to modify that object
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PhantomWithConcavePiece"
@@ -8876,6 +8909,39 @@ You cannot modify the navmesh across region boundaries.
 You don't have permission to modify that object.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="NoSetPhysicsPropertiesOnObjectType"
@@ -9022,18 +9088,52 @@ Object uses too many physics resources -- its dynamics have been disabled.
 
   <notification
    icon="alertmodal.tga"
-   name="TeleportAgentByObjectWithParcelInfo"
+   name="TeleportedHomeByObjectOnParcel"
+   persist="true"
    type="notify">
    <tag>fail</tag>
-You have been teleported home by the object ... on the parcel ...
+You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="TeleportAgentByObject"
+   name="TeleportedHomeByObject"
+   persist="true"
    type="notify">
    <tag>fail</tag>
-You have been teleported home by the object ... on the parcel ...
+You have been teleported home by the object '[OBJECT_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByAttachment"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by an attachment on [ITEM_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOnParcel"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOwnedBy"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectUnknownUser"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]'
   </notification>
 
   <notification
@@ -9852,5 +9952,13 @@ You cannot give L$ to public objects.
 Inventory creation on in-world object failed.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="UserBalanceOrLandUsageError"
+   type="notify">
+   <tag>fail</tag>
+An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
+  </notification>
+
 
 </notifications>
-- 
cgit v1.2.3


From adce92282bd190f97b377512ce76fe375e0f115a Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Mon, 24 Sep 2012 19:05:37 +0000
Subject: Fixed a localized message that wasn't correct.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8c3cdccbdb..232ed2dcb4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9133,7 +9133,7 @@ You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
    name="TeleportedByObjectUnknownUser"
    type="notify">
    <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]'
+You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 976a2f5a442150ef89cff6b39450eabbca956d0f Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 26 Sep 2012 20:45:18 +0300
Subject: CHUI-344 FIXED (LLConversationViewSession: enable icon update)

- This commit also fixes CHUI-345 CHUI-346
---
 .../xui/en/panel_conversation_list_item.xml        | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 375ea79ebe..56056ed560 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -13,13 +13,33 @@
      layout="topleft"
      left="5"
      top="2"
+     visible="false"
      width="20" />
+    <group_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Group"
+     layout="topleft"
+     left="5"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     image_name="Nearby_chat_icon"
+     layout="topleft"
+     left="5"
+     name="nearby_chat_icon"
+     top="2"
+     visible="false"
+     width="20"/>
     <layout_stack
      animate="false"
      follows="all"
      height="24"
      layout="topleft"
-     left_pad="5"
+     left="30"
      mouse_opaque="false"
      name="conversation_item_stack"
      orientation="horizontal"
@@ -36,7 +56,7 @@
             <icon
              height="20"
              follows="top|right|left"
-             image_name="Conv_toolbar_hang_up"
+             image_name="Conv_toolbar_open_call"
              layout="topleft"
              left="0"
              name="selected_icon"
@@ -70,7 +90,7 @@
 		     layout="topleft"
 		     left_pad="5"
  		     mouse_opaque="true"
- 		     name="speaking_indicator"
+ 		     name="speaking_indicatorn"
  		     visible="false"
  		     width="20" />
         </layout_panel>
-- 
cgit v1.2.3


From 483cbd74d78b8fa7ce94e3d3c7d264bcdaa331b5 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 27 Sep 2012 20:09:22 +0300
Subject: CHUI-165 FIXED Add access to Conversation Log and Chat History from
 the People floater.

---
 .../newview/skins/default/xui/en/menu_people_friends_view.xml  |  8 ++++++++
 indra/newview/skins/default/xui/en/menu_people_nearby.xml      | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index eab7b8c085..dde9432867 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -40,4 +40,12 @@
      function="CheckControl"
      parameter="FriendsListShowPermissions" />
   </menu_item_check>
+  <menu_item_check name="view_conversation" label="View Conversation Log...">
+    <menu_item_check.on_check
+     function="Floater.Visible"
+     parameter="conversation" />
+    <menu_item_check.on_click
+     function="Floater.Toggle"
+     parameter="conversation" />
+  </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index b7c9ab1fe3..8014e81469 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -36,6 +36,14 @@
          parameter="can_call" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call
+     label="View chat history..."
+     layout="topleft"
+     name="Chat history">
+        <menu_item_call.on_click
+         function="Avatar.Calllog" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_call
      label="Add Friend"
      layout="topleft"
@@ -101,5 +109,5 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-
+    <menu_item_separator />
 </context_menu>
-- 
cgit v1.2.3


From 3e3735c16b47402d8fc2da8afa6086638fb5b948 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 28 Sep 2012 15:02:31 +0300
Subject: CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking
 indicator)

- Clicking on the conversation speaking icon brings up the volume floater for voice conversations
---
 .../default/xui/en/floater_voice_chat_volume.xml   | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5c71fd3bc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE CHAT VOLUME"
+ visible="true"
+ width="245">
+	<slider
+		control_name="AudioLevelVoice"
+		disabled_control="MuteAudio"
+		follows="left|top"
+		height="16"
+		increment="0.025"
+		initial_value="0.5"
+		label="Voice Chat"
+		label_width="50"
+		layout="topleft"
+		left="15"
+		top="50"
+		name="chat_voice_volume"
+		show_text="false"
+		slider_label.halign="right"
+		volume="true"
+		width="200">
+	</slider>
+	<button
+		control_name="MuteVoice"
+		disabled_control="MuteAudio"
+		follows="top|left"
+		height="16"
+		image_selected="AudioMute_Off"
+		image_unselected="Audio_Off"
+		is_toggle="true"
+		layout="topleft"
+		left_pad="5"
+		name="mute_audio"
+		tab_stop="false"
+		width="16" />
+</floater>
\ No newline at end of file
-- 
cgit v1.2.3


From 14307b099bdb0e7c5b56d052a55e010ecd69b5c3 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 28 Sep 2012 19:06:36 +0300
Subject: CHUI-361 FIXED (Viewer crash when selecting to start IM with user
 from right click menu in people floater ): prevent destruction of
 im_container; suppress warning for the nearby_chat

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index d23ff28fd0..590ce45c33 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -11,6 +11,7 @@
  save_rect="true"
  save_visibility="true"
  single_instance="true"
+ reuse_instance="true"
  title="CONVERSATIONS"
  width="680">
     <string
-- 
cgit v1.2.3


From 11a148415e810706f2a1835b6b717a0a062d458f Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 28 Sep 2012 18:22:05 -0700
Subject: CHUI-102: Now the participants and one-on-one conversations have
 right-click-menus. These menus are functional as well, but 'chat history'
 does not yet work.

---
 .../skins/default/xui/en/menu_conversation.xml     | 109 +++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_conversation.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
new file mode 100644
index 0000000000..94399be61c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_conversation_participant"
+ visible="false">
+     <menu_item_call
+     label="Close conversation"
+     layout="topleft"
+     name="close_conversation">
+        <on_click function="Avatar.DoToSelected" parameter="close_conversation"/>
+	 </menu_item_call>
+     <menu_item_call
+     label="Open voice conversation"
+     layout="topleft"
+     name="open_voice_conversation">
+        <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
+     </menu_item_call>	
+     <menu_item_call
+     label="Disconnect from voice"
+     layout="topleft"
+     name="disconnect_from_voice">
+        <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/>
+    </menu_item_call>	
+	<menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/>	
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="view_profile">
+        <on_click function="Avatar.DoToSelected" parameter="view_profile"/>
+    </menu_item_call>
+    <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="im">
+        <on_click function="Avatar.DoToSelected" parameter="im"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Offer teleport"
+     layout="topleft"
+     name="offer_teleport">
+        <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="voice_call">
+        <on_click function="Avatar.DoToSelected" parameter="voice_call"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_call" />
+    </menu_item_call>
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="chat_history">
+        <on_click function="Avatar.DoToSelected" parameter="chat_history"/>
+    </menu_item_call>	
+    <menu_item_separator layout="topleft" name="separator_chat_history"/>	
+    <menu_item_call
+     label="Add friend"
+     layout="topleft"
+     name="add_friend">
+        <on_click function="Avatar.DoToSelected" parameter="add_friend"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableItem" parameter="can_delete" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="invite_to_group">
+        <on_click function="Avatar.DoToSelected" parameter="invite_to_group" />
+    </menu_item_call>
+    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>		
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="map">
+        <on_click function="Avatar.DoToSelected" parameter="map" />
+        <on_enable function="Avatar.EnableItem" parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="share">
+        <on_click function="Avatar.DoToSelected" parameter="share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="pay">
+        <on_click function="Avatar.DoToSelected" parameter="pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block / unblock"
+     layout="topleft"
+     name="block_unblock">
+        <on_click function="Avatar.DoToSelected" parameter="block_unblock" />
+		<on_check function="Avatar.CheckItem" parameter="is_blocked" />
+		<on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    </menu_item_check>
+</toggleable_menu>
-- 
cgit v1.2.3


From 598f5345866c58abdd971935d80f9b53756042c9 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 1 Oct 2012 17:04:13 -0700
Subject: CHUI-102: Right clicking on a group conversation brings up the
 correct menu. The user can now view the group profile, activate the group and
 leave the group.

---
 .../newview/skins/default/xui/en/menu_conversation.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 94399be61c..bf834ee9ff 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -25,6 +25,24 @@
         <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/>
     </menu_item_call>	
 	<menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/>	
+    <menu_item_call
+     label="Group Profile"
+     layout="topleft"
+     name="group_profile">
+        <on_click function="Group.DoToSelected" parameter="group_profile"/>
+    </menu_item_call>	
+    <menu_item_call
+     label="Activate Group"
+     layout="topleft"
+     name="activate_group">
+        <on_click function="Group.DoToSelected" parameter="activate_group"/>
+    </menu_item_call>		
+    <menu_item_call
+     label="Leave Group"
+     layout="topleft"
+     name="leave_group">
+        <on_click function="Group.DoToSelected" parameter="leave_group"/>
+    </menu_item_call>			
     <menu_item_call
      label="View Profile"
      layout="topleft"
-- 
cgit v1.2.3


From 5f75cf57773a017b6d15d07047b98522c0856b4b Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Tue, 2 Oct 2012 09:30:56 -0700
Subject: MAINT-1526 : Save Back to Inventory has been disabled on server side
 but stays in UI.  Removed it.  Reviewed by Kelly

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c6d9f9ef8f..59d268c53a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -884,14 +884,6 @@
 			<menu_item_call.on_enable
                function="Tools.EnableTakeCopy" />
           </menu_item_call>
-          <menu_item_call
-			 label="Save Back to My Inventory"
-			 name="Save Object Back to My Inventory">
-			<menu_item_call.on_click
-               function="Tools.SaveToInventory" />
-			<menu_item_call.on_enable
-               function="Tools.EnableSaveToInventory" />
-          </menu_item_call>
           <menu_item_call
 			 label="Save Back to Object Contents"
 			 name="Save Object Back to Object Contents">
-- 
cgit v1.2.3


From 7ba6111d9149baea48869c2f30506581d2c6babf Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 2 Oct 2012 21:32:23 +0300
Subject: CHUI-190 (Remove the Voice Settings floater): removed the menu item
 "Communicate > Voice settings" and the FUI button (headphones) from the
 Toybox (Toolbox). I left a floater in the project to be able to reconnect it
 to a different location.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index aa131035ed..4bbf253e4a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -243,16 +243,6 @@
              function="Agent.ToggleMicrophone"
              parameter="speak" />
         </menu_item_check>
-        <menu_item_check
-         label="Voice settings..."
-         name="Nearby Voice">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="voice_controls" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="voice_controls" />
-        </menu_item_check>
         <menu_item_check
          label="Voice morphing..."
          name="ShowVoice"
-- 
cgit v1.2.3


From ed9ade7d50b699ac60eb69a979ea32a60eefa630 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 2 Oct 2012 17:03:46 -0700
Subject: CHUI-102: Now the options menu (right-click menu) for a
 participant/conversation will open the 'Chat history' dialog when selected.

---
 .../skins/default/xui/en/menu_conversation.xml     | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index bf834ee9ff..912ff811d9 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -25,24 +25,6 @@
         <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/>
     </menu_item_call>	
 	<menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/>	
-    <menu_item_call
-     label="Group Profile"
-     layout="topleft"
-     name="group_profile">
-        <on_click function="Group.DoToSelected" parameter="group_profile"/>
-    </menu_item_call>	
-    <menu_item_call
-     label="Activate Group"
-     layout="topleft"
-     name="activate_group">
-        <on_click function="Group.DoToSelected" parameter="activate_group"/>
-    </menu_item_call>		
-    <menu_item_call
-     label="Leave Group"
-     layout="topleft"
-     name="leave_group">
-        <on_click function="Group.DoToSelected" parameter="leave_group"/>
-    </menu_item_call>			
     <menu_item_call
      label="View Profile"
      layout="topleft"
@@ -124,4 +106,22 @@
 		<on_check function="Avatar.CheckItem" parameter="is_blocked" />
 		<on_enable  function="Avatar.EnableItem" parameter="can_block" />
     </menu_item_check>
+	<menu_item_call
+     label="Group Profile"
+     layout="topleft"
+     name="group_profile">
+        <on_click function="Group.DoToSelected" parameter="group_profile"/>
+    </menu_item_call>	
+    <menu_item_call
+     label="Activate Group"
+     layout="topleft"
+     name="activate_group">
+        <on_click function="Group.DoToSelected" parameter="activate_group"/>
+    </menu_item_call>		
+    <menu_item_call
+     label="Leave Group"
+     layout="topleft"
+     name="leave_group">
+        <on_click function="Group.DoToSelected" parameter="leave_group"/>
+    </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From bb2f48cb93a142deed863287d009017177e6a0be Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 3 Oct 2012 13:55:09 +0300
Subject: CHUI-301 FIXED Tooltips for buttons are added

---
 indra/newview/skins/default/xui/en/floater_conversation_log.xml        | 2 ++
 .../newview/skins/default/xui/en/panel_conversation_log_list_item.xml  | 3 +++
 2 files changed, 5 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 12d17e6b37..c9c52e5ce5 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -49,6 +49,7 @@
           menu_filename="menu_conversation_log_view.xml"
           menu_position="bottomleft"
           name="conversation_view_btn"
+          tool_tip="View/sort options"
           top="3"
           width="31" />
         <menu_button
@@ -61,6 +62,7 @@
           layout="topleft"
           left_pad="2"
           name="conversations_gear_btn"
+          tool_tip="Actions on selected person or group"
           top="3"
           width="31" />
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
index 8a58eb1ca6..78d4c174d2 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -35,6 +35,7 @@
      image_name="Conv_toolbar_open_call"
      mouse_opaque="true"
      name="voice_session_icon"
+     tool_tip="Included a voice conversation"
      top="2"
      visible="false"
      width="20" />
@@ -46,6 +47,7 @@
      image_name="Conv_log_inbox"
      mouse_opaque="false"
      name="unread_ims_icon"
+     tool_tip="Messages arrived while you were logged out"
      top="2"
      visible="false"
      width="20" />
@@ -92,6 +94,7 @@
      width="110"/>
     <button
      name="delete_btn"
+     tool_tip="Remove this entry"
      layout="topleft"
      follows="top|right"
      image_unselected="Conv_toolbar_close"
-- 
cgit v1.2.3


From 7535d3b5daa235540bbd5f0e784fc3fba484d614 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 3 Oct 2012 14:07:01 +0300
Subject: CHUI-322 FIXED Call SideTray.PanelPeopleTab with
 parameter="blocked_panel" instead of Communicate.BlockList

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4bbf253e4a..88b30c8272 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -294,7 +294,8 @@
          label="Block List"
          name="Block List">
             <menu_item_call.on_click
-              function="Communicate.BlockList" />
+              function="SideTray.PanelPeopleTab"
+              parameter="blocked_panel" />
         </menu_item_call>
     </menu>
     <menu
-- 
cgit v1.2.3


From dfc75e94141d8abd1fc288920a5fd8ffaeda041b Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 3 Oct 2012 18:24:39 -0700
Subject: Renaming the XUI files for floater_stinson to
 floater_debug_materials.

---
 .../default/xui/en/floater_debug_materials.xml     | 270 ++++++++++++++++++++
 .../skins/default/xui/en/floater_stinson.xml       | 271 ---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   2 +-
 3 files changed, 271 insertions(+), 272 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_debug_materials.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_stinson.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
new file mode 100644
index 0000000000..d7ec5d5e7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    positioning="cascading"
+    can_tear_off="false"
+    can_resize="true"
+    height="575"
+    width="1244"
+    min_height="600"
+    min_width="1100"
+    layout="topleft"
+    name="debug_materials"
+    reuse_instance="true"
+    save_rect="false"
+    single_instance="true"
+    title="Stinson Test">
+  <floater.string name="status_no_region">No current region available.</floater.string>
+  <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
+  <floater.string name="status_ready">Materials are enabled for this region.</floater.string>
+  <floater.string name="status_request_started">Request sent.</floater.string>
+  <floater.string name="status_request_completed">Request received.</floater.string>
+  <floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string>
+  <floater.string name="status_error">An error occurred during the request.</floater.string>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="61"
+      width="214">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="0"
+        width="214">
+      Status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="MaterialGoodColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="material_status"
+        top_pad="8"
+        width="214">
+    </text>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|right|top"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
+      left="12"
+      width="1220"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right"
+      layout="topleft"
+      height="167"
+      top_pad="10"
+      width="1220">
+    <button
+        follows="left|top"
+        height="22"
+        label="Get"
+        layout="topleft"
+        name="get_button"
+        top_pad="0"
+        width="214"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="left|top|right"
+        height="135"
+        layout="topleft"
+        top_pad="10"
+        tab_stop="false"
+        multi_select="true"
+        name="get_scroll_list"
+        width="1220">
+      <scroll_list.columns
+          label="Material ID"
+          name="id"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Normal Map"
+          name="normal_map"
+          width="225" />
+      <scroll_list.columns
+          label="Specular Map"
+          name="specular_map"
+          width="225" />
+      <scroll_list.columns
+          label="Specular Color"
+          name="specular_color"
+          width="120" />
+      <scroll_list.columns
+          label="Specular Exponent"
+          name="specular_exponent"
+          width="112" />
+      <scroll_list.columns
+          label="Env Intensity"
+          name="env_intensity"
+          width="80" />
+      <scroll_list.columns
+          label="Alpha Mask Cutoff"
+          name="alpha_mask_cutoff"
+          width="110" />
+      <scroll_list.columns
+          label="Diffuse Alpha Mode"
+          name="diffuse_alpha_mode"
+          width="118" />
+    </scroll_list>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|right|top"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="10"
+      left="12"
+      width="1220"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="132"
+      width="450">
+    <button
+        follows="left|top"
+        height="22"
+        label="Put Face Data Set"
+        layout="topleft"
+        name="put_set_button"
+        top_pad="0"
+        width="214"/>
+    <button
+        follows="left|top"
+        height="22"
+        label="Put Face Data Clear"
+        layout="topleft"
+        name="put_clear_button"
+        left_pad="20"
+        width="214"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="left|top|right"
+        height="100"
+        layout="topleft"
+        left="0"
+        top_pad="10"
+        tab_stop="false"
+        multi_select="true"
+        name="put_scroll_list"
+        width="400">
+      <scroll_list.columns
+          label="Object ID"
+          name="object_id"
+          width="80" />
+      <scroll_list.columns
+          label="Face Index"
+          name="face_index"
+          width="70" />
+      <scroll_list.columns
+          label="MaterialID"
+          name="material_id"
+          dynamic_width="true" />
+    </scroll_list>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|right|top"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="10"
+      left="12"
+      width="1220"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="132"
+      width="1220">
+    <button
+        follows="left|top"
+        height="22"
+        label="Post Good Material ID"
+        layout="topleft"
+        name="good_post_button"
+        top_pad="0"
+        width="214"/>
+    <button
+        follows="left|top"
+        height="22"
+        label="Post Bad Material ID"
+        layout="topleft"
+        name="bad_post_button"
+        left_pad="20"
+        width="214"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="left|top|right"
+        height="100"
+        layout="topleft"
+        top_pad="10"
+        left="0"
+        tab_stop="false"
+        multi_select="true"
+        name="post_scroll_list"
+        width="1220">
+      <scroll_list.columns
+          label="Material ID"
+          name="id"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Normal Map"
+          name="normal_map"
+          width="225" />
+      <scroll_list.columns
+          label="Specular Map"
+          name="specular_map"
+          width="225" />
+      <scroll_list.columns
+          label="Specular Color"
+          name="specular_color"
+          width="120" />
+      <scroll_list.columns
+          label="Specular Exponent"
+          name="specular_exponent"
+          width="112" />
+      <scroll_list.columns
+          label="Env Intensity"
+          name="env_intensity"
+          width="80" />
+      <scroll_list.columns
+          label="Alpha Mask Cutoff"
+          name="alpha_mask_cutoff"
+          width="110" />
+      <scroll_list.columns
+          label="Diffuse Alpha Mode"
+          name="diffuse_alpha_mode"
+          width="118" />
+    </scroll_list>
+  </panel>
+  </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
deleted file mode 100644
index b152dd5fc8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    positioning="cascading"
-    can_tear_off="false"
-    can_resize="true"
-    height="575"
-    width="1244"
-    min_height="600"
-    min_width="1100"
-    layout="topleft"
-    name="floater_stinson"
-    help_topic="floater_stinson"
-    reuse_instance="true"
-    save_rect="false"
-    single_instance="true"
-    title="Stinson Test">
-  <floater.string name="status_no_region">No current region available.</floater.string>
-  <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
-  <floater.string name="status_ready">Materials are enabled for this region.</floater.string>
-  <floater.string name="status_request_started">Request sent.</floater.string>
-  <floater.string name="status_request_completed">Request received.</floater.string>
-  <floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string>
-  <floater.string name="status_error">An error occurred during the request.</floater.string>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="61"
-      width="214">
-    <text
-        height="13"
-        word_wrap="true"
-        use_ellipses="false"
-        type="string"
-        text_color="LabelTextColor"
-        length="1"
-        layout="topleft"
-        left="0"
-        top_pad="0"
-        width="214">
-      Status
-    </text>
-    <text
-        height="40"
-        word_wrap="true"
-        use_ellipses="false"
-        type="string"
-        text_color="MaterialGoodColor"
-        length="1"
-        follows="left|top"
-        layout="topleft"
-        left="0"
-        name="material_status"
-        top_pad="8"
-        width="214">
-    </text>
-  </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="0"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      height="167"
-      top_pad="10"
-      width="1220">
-    <button
-        follows="left|top"
-        height="22"
-        label="Get"
-        layout="topleft"
-        name="get_button"
-        top_pad="0"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
-        follows="left|top|right"
-        height="135"
-        layout="topleft"
-        top_pad="10"
-        tab_stop="false"
-        multi_select="true"
-        name="get_scroll_list"
-        width="1220">
-      <scroll_list.columns
-          label="Material ID"
-          name="id"
-          dynamic_width="true" />
-      <scroll_list.columns
-          label="Normal Map"
-          name="normal_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Map"
-          name="specular_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Color"
-          name="specular_color"
-          width="120" />
-      <scroll_list.columns
-          label="Specular Exponent"
-          name="specular_exponent"
-          width="112" />
-      <scroll_list.columns
-          label="Env Intensity"
-          name="env_intensity"
-          width="80" />
-      <scroll_list.columns
-          label="Alpha Mask Cutoff"
-          name="alpha_mask_cutoff"
-          width="110" />
-      <scroll_list.columns
-          label="Diffuse Alpha Mode"
-          name="diffuse_alpha_mode"
-          width="118" />
-    </scroll_list>
-  </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="10"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="132"
-      width="450">
-    <button
-        follows="left|top"
-        height="22"
-        label="Put Face Data Set"
-        layout="topleft"
-        name="put_set_button"
-        top_pad="0"
-        width="214"/>
-    <button
-        follows="left|top"
-        height="22"
-        label="Put Face Data Clear"
-        layout="topleft"
-        name="put_clear_button"
-        left_pad="20"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
-        follows="left|top|right"
-        height="100"
-        layout="topleft"
-        left="0"
-        top_pad="10"
-        tab_stop="false"
-        multi_select="true"
-        name="put_scroll_list"
-        width="400">
-      <scroll_list.columns
-          label="Object ID"
-          name="object_id"
-          width="80" />
-      <scroll_list.columns
-          label="Face Index"
-          name="face_index"
-          width="70" />
-      <scroll_list.columns
-          label="MaterialID"
-          name="material_id"
-          dynamic_width="true" />
-    </scroll_list>
-  </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="10"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="132"
-      width="1220">
-    <button
-        follows="left|top"
-        height="22"
-        label="Post Good Material ID"
-        layout="topleft"
-        name="good_post_button"
-        top_pad="0"
-        width="214"/>
-    <button
-        follows="left|top"
-        height="22"
-        label="Post Bad Material ID"
-        layout="topleft"
-        name="bad_post_button"
-        left_pad="20"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
-        follows="left|top|right"
-        height="100"
-        layout="topleft"
-        top_pad="10"
-        left="0"
-        tab_stop="false"
-        multi_select="true"
-        name="post_scroll_list"
-        width="1220">
-      <scroll_list.columns
-          label="Material ID"
-          name="id"
-          dynamic_width="true" />
-      <scroll_list.columns
-          label="Normal Map"
-          name="normal_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Map"
-          name="specular_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Color"
-          name="specular_color"
-          width="120" />
-      <scroll_list.columns
-          label="Specular Exponent"
-          name="specular_exponent"
-          width="112" />
-      <scroll_list.columns
-          label="Env Intensity"
-          name="env_intensity"
-          width="80" />
-      <scroll_list.columns
-          label="Alpha Mask Cutoff"
-          name="alpha_mask_cutoff"
-          width="110" />
-      <scroll_list.columns
-          label="Diffuse Alpha Mode"
-          name="diffuse_alpha_mode"
-          width="118" />
-    </scroll_list>
-  </panel>
-  </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e94253fcf6..785ae8f366 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -994,7 +994,7 @@
           name="StinsonMenu">
         <menu_item_call.on_click
             function="Floater.ToggleOrBringToFront"
-            parameter="floater_stinson" />
+            parameter="debug_materials" />
       </menu_item_call>
 
       <menu_item_separator/>
-- 
cgit v1.2.3


From 93b7f615bc8d1bc6f928eeba7d0412455af6b478 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 3 Oct 2012 18:42:49 -0700
Subject: Moving the debug materials floater under the Develop menu and
 renaming.

---
 .../default/xui/en/floater_debug_materials.xml      |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml  | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index d7ec5d5e7c..0c4d311c0f 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -12,7 +12,7 @@
     reuse_instance="true"
     save_rect="false"
     single_instance="true"
-    title="Stinson Test">
+    title="Debug materials">
   <floater.string name="status_no_region">No current region available.</floater.string>
   <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
   <floater.string name="status_ready">Materials are enabled for this region.</floater.string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 785ae8f366..8b47f3a25d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -987,16 +987,6 @@
       </menu>
 
 
-      <menu_item_separator/>
-
-      <menu_item_call
-          label="Stinson"
-          name="StinsonMenu">
-        <menu_item_call.on_click
-            function="Floater.ToggleOrBringToFront"
-            parameter="debug_materials" />
-      </menu_item_call>
-
       <menu_item_separator/>
 
         <menu
@@ -2621,6 +2611,17 @@
             <menu_item_check.on_enable
                  function="Advanced.EnableRenderDeferredOptions" />
           </menu_item_check>
+
+          <menu_item_separator/>
+
+          <menu_item_call
+              label="Debug materials ..."
+              name="DebugMaterialsMenu">
+            <menu_item_call.on_click
+                function="Floater.ToggleOrBringToFront"
+                parameter="debug_materials" />
+          </menu_item_call>
+
           <menu_item_separator />
 
           <menu_item_check
-- 
cgit v1.2.3


From 8013e645603d1075b848ef91178af0fa3f9dc38c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 4 Oct 2012 14:30:16 +0300
Subject: CHUI-313 FIXED "Conversations", "Conversations Log" menu items are
 added

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 88b30c8272..c805b6db42 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -218,8 +218,18 @@
      label="Communicate"
      name="Communicate"
      tear_off="true">
-        <menu_item_check
-         label="Chat..."
+       <menu_item_check
+         label="Conversations..."
+         name="Conversations">
+            <menu_item_check.on_check
+             function="Floater.IsOpen"
+             parameter="im_container" />
+            <menu_item_check.on_click
+             function="Floater.ToggleOrBringToFront"
+             parameter="im_container" />
+	</menu_item_check>
+	<menu_item_check
+         label="Nearby Chat..."
          name="Nearby Chat"
          shortcut="control|H"
          use_mac_ctrl="true">
@@ -243,6 +253,17 @@
              function="Agent.ToggleMicrophone"
              parameter="speak" />
         </menu_item_check>
+        <menu_item_check
+         label="Conversations Log..."
+         name="ConversationsLog">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="conversation" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="conversation" />
+        </menu_item_check>
+        <menu_item_separator/>
         <menu_item_check
          label="Voice morphing..."
          name="ShowVoice"
-- 
cgit v1.2.3


From 050146ce5ef889d254624ee456f04703fce357d3 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 4 Oct 2012 14:53:36 +0300
Subject: CHUI-327 FIXED Set "left" property for chat_history element

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 5c74f7f9bb..8cd0463de8 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -246,7 +246,7 @@
          parse_highlights="true"
          parse_urls="true"
        	 width="230"
-       	 left="0">
+       	 left="5">
         </chat_history>
             </layout_panel>
            </layout_stack>
-- 
cgit v1.2.3


From ddc004c2010583efea82eb9b72d96873391a7bb1 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 4 Oct 2012 19:17:42 -0700
Subject: Adding the new material settings to the edit values.  And an initial
 re-organization of the groups into tabs.  Still a WIP, but somewhat usable.

---
 .../default/xui/en/floater_debug_materials.xml     | 925 ++++++++++++++++-----
 1 file changed, 737 insertions(+), 188 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 0c4d311c0f..122b5e54e1 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -3,7 +3,7 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="575"
+    height="680"
     width="1244"
     min_height="600"
     min_width="1100"
@@ -66,205 +66,754 @@
       top_pad="0"
       left="12"
       width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
+  <tab_container
       follows="left|top|right"
       layout="topleft"
-      height="167"
+      tab_position="top"
+      name="view_test_tab_container"
+      left="10"
       top_pad="10"
+      height="500"
       width="1220">
-    <button
-        follows="left|top"
-        height="22"
-        label="Get"
-        layout="topleft"
-        name="get_button"
-        top_pad="0"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
+    <panel
+        border="true"
+        bevel_style="none"
         follows="left|top|right"
-        height="135"
         layout="topleft"
+        label="Region"
+        height="167"
         top_pad="10"
-        tab_stop="false"
-        multi_select="true"
-        name="get_scroll_list"
         width="1220">
-      <scroll_list.columns
-          label="Material ID"
-          name="id"
-          dynamic_width="true" />
-      <scroll_list.columns
-          label="Normal Map"
-          name="normal_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Map"
-          name="specular_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Color"
-          name="specular_color"
-          width="120" />
-      <scroll_list.columns
-          label="Specular Exponent"
-          name="specular_exponent"
-          width="112" />
-      <scroll_list.columns
-          label="Env Intensity"
-          name="env_intensity"
-          width="80" />
-      <scroll_list.columns
-          label="Alpha Mask Cutoff"
-          name="alpha_mask_cutoff"
-          width="110" />
-      <scroll_list.columns
-          label="Diffuse Alpha Mode"
-          name="diffuse_alpha_mode"
-          width="118" />
-    </scroll_list>
-  </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="10"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="132"
-      width="450">
-    <button
-        follows="left|top"
-        height="22"
-        label="Put Face Data Set"
-        layout="topleft"
-        name="put_set_button"
-        top_pad="0"
-        width="214"/>
-    <button
-        follows="left|top"
-        height="22"
-        label="Put Face Data Clear"
-        layout="topleft"
-        name="put_clear_button"
-        left_pad="20"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
+      <panel
+          border="false"
+          bevel_style="none"
+          follows="left|top|right"
+          layout="topleft"
+          height="167"
+          top_pad="10"
+          width="1220">
+        <button
+            follows="left|top"
+            height="22"
+            label="Get"
+            layout="topleft"
+            name="get_button"
+            top_pad="0"
+            width="214"/>
+        <scroll_list
+            column_padding="0"
+            draw_heading="true"
+            follows="left|top|right"
+            height="135"
+            layout="topleft"
+            top_pad="10"
+            tab_stop="false"
+            multi_select="true"
+            name="get_scroll_list"
+            width="1220">
+          <scroll_list.columns
+              label="Material ID"
+              name="id"
+              dynamic_width="true" />
+          <scroll_list.columns
+              label="Normal Map"
+              name="normal_map"
+              width="225" />
+          <scroll_list.columns
+              label="Specular Map"
+              name="specular_map"
+              width="225" />
+          <scroll_list.columns
+              label="Specular Color"
+              name="specular_color"
+              width="120" />
+          <scroll_list.columns
+              label="Specular Exponent"
+              name="specular_exponent"
+              width="112" />
+          <scroll_list.columns
+              label="Env Intensity"
+              name="env_intensity"
+              width="80" />
+          <scroll_list.columns
+              label="Alpha Mask Cutoff"
+              name="alpha_mask_cutoff"
+              width="110" />
+          <scroll_list.columns
+              label="Diffuse Alpha Mode"
+              name="diffuse_alpha_mode"
+              width="118" />
+        </scroll_list>
+      </panel>
+    </panel>
+    <panel
+        border="true"
+        bevel_style="none"
         follows="left|top|right"
-        height="100"
         layout="topleft"
-        left="0"
+        label="Object editing"
+        height="167"
         top_pad="10"
-        tab_stop="false"
-        multi_select="true"
-        name="put_scroll_list"
-        width="400">
-      <scroll_list.columns
-          label="Object ID"
-          name="object_id"
-          width="80" />
-      <scroll_list.columns
-          label="Face Index"
-          name="face_index"
-          width="70" />
-      <scroll_list.columns
-          label="MaterialID"
-          name="material_id"
-          dynamic_width="true" />
-    </scroll_list>
-  </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="10"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="132"
-      width="1220">
-    <button
-        follows="left|top"
-        height="22"
-        label="Post Good Material ID"
-        layout="topleft"
-        name="good_post_button"
-        top_pad="0"
-        width="214"/>
-    <button
-        follows="left|top"
-        height="22"
-        label="Post Bad Material ID"
-        layout="topleft"
-        name="bad_post_button"
-        left_pad="20"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
+        width="1220">
+      <panel
+          border="false"
+          bevel_style="none"
+          follows="left|top|right"
+          layout="topleft"
+          left="2"
+          top_pad="10"
+          height="410"
+          width="810">
+        <panel
+            border="false"
+            bevel_style="none"
+            follows="left|top|right"
+            layout="topleft"
+            height="265"
+            top_pad="0"
+            width="810">
+          <panel
+              border="false"
+              bevel_style="none"
+              follows="left|top|right"
+              layout="topleft"
+              height="226"
+              top_pad="0"
+              width="263">
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left="0"
+                top_pad="38"
+                width="160">
+              Normal Map
+            </text>
+            <texture_picker
+                allow_no_texture="true"
+                can_apply_immediately="true"
+                default_image_name="Default"
+                follows="left|top"
+                left_pad="0"
+                top_pad="-50"
+                label_width="0"
+                height="100"
+                width="100"
+                mouse_opaque="true"
+                name="normal_map"
+                tool_tip="Click to open texture picker" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-260"
+                top_pad="10"
+                width="160">
+              Normal Map Offset X
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="normal_map_offset_x"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Normal Map Offset Y
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="normal_map_offset_y"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Normal Map Repeat X
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="normal_map_repeat_x"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Normal Map Repeat Y
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="normal_map_repeat_y"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Normal Map Rotation
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="normal_map_rotation"
+                width="80" />
+          </panel>
+          <panel
+              border="false"
+              bevel_style="none"
+              follows="left|top|right"
+              layout="topleft"
+              height="226"
+              top_pad="-226"
+              left_pad="20"
+              width="263">
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left="0"
+                top_pad="38"
+                width="160">
+              Specular Map
+            </text>
+            <texture_picker
+                allow_no_texture="true"
+                can_apply_immediately="true"
+                default_image_name="Default"
+                follows="left|top"
+                left_pad="0"
+                top_pad="-50"
+                label_width="0"
+                height="100"
+                width="100"
+                mouse_opaque="true"
+                name="specular_map"
+                tool_tip="Click to open texture picker" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-260"
+                top_pad="10"
+                width="160">
+              Specular Map Offset X
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="specular_map_offset_x"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Specular Map Offset Y
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="specular_map_offset_y"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Specular Map Repeat X
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="specular_map_repeat_x"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Specular Map Repeat Y
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="specular_map_repeat_y"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Specular Map Rotation
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="specular_map_rotation"
+                width="80" />
+          </panel>
+          <panel
+              border="false"
+              bevel_style="none"
+              follows="left|top|right"
+              layout="topleft"
+              height="132"
+              top_pad="-226"
+              left_pad="20"
+              width="243">
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left="0"
+                top_pad="10"
+                width="160">
+              Specular Color
+            </text>
+            <color_swatch
+                can_apply_immediately="true"
+                color="1 1 1 1"
+                follows="left|top"
+                height="30"
+                layout="topleft"
+                label_height="0"
+                label_width="0"
+                left_pad="0"
+                top_pad="-22"
+                name="specular_color"
+                tool_tip="Click to open color picker"
+                width="40" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-200"
+                top_pad="10"
+                width="160">
+              Specular Exponent
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="specular_exponent"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Environment Exponent
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="environment_exponent"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Alpha Mask Cuttoff
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="alpha_mask_cutoff"
+                width="80" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-240"
+                top_pad="10"
+                width="160">
+              Diffuse Alpha Mode
+            </text>
+            <line_editor
+                border_style="line"
+                border_thickness="1"
+                default_text="0"
+                follows="left|top"
+                height="20"
+                layout="topleft"
+                left_pad="0"
+                top_pad="-18"
+                max_length_chars="255"
+                name="diffuse_alpha_mode"
+                width="80" />
+          </panel>
+          <panel
+              border="false"
+              bevel_style="none"
+              follows="left|top|right"
+              layout="topleft"
+              height="22"
+              left="0"
+              top_pad="110"
+              width="450">
+            <button
+                follows="left|top"
+                height="22"
+                label="Set Face Data"
+                layout="topleft"
+                name="put_set_button"
+                left="0"
+                top="0"
+                width="214"/>
+            <button
+                follows="left|top"
+                height="22"
+                label="Clear Face Data"
+                layout="topleft"
+                name="put_clear_button"
+                left_pad="20"
+                width="214"/>
+          </panel>
+
+        </panel>
+        <view_border
+            bevel_style="none"
+            follows="left|right|top"
+            height="0"
+            layout="topleft"
+            name="horiz_separator"
+            top_pad="10"
+            left="0"
+            width="810"/>
+        <panel
+            border="false"
+            bevel_style="none"
+            follows="left|top|right"
+            layout="topleft"
+            height="125"
+            top_pad="20"
+            width="400">
+          <text
+              height="13"
+              word_wrap="false"
+              use_ellipses="false"
+              type="string"
+              text_color="LabelTextColor"
+              length="1"
+              follows="left|top"
+              layout="topleft"
+              left="0"
+              top_pad="0"
+              width="160">
+            Results
+          </text>
+          <scroll_list
+              column_padding="0"
+              draw_heading="true"
+              follows="left|top|right"
+              height="100"
+              layout="topleft"
+              left="0"
+              top_pad="10"
+              tab_stop="false"
+              multi_select="true"
+              name="put_scroll_list"
+              width="400">
+            <scroll_list.columns
+                label="Object ID"
+                name="object_id"
+                width="80" />
+            <scroll_list.columns
+                label="Face Index"
+                name="face_index"
+                width="70" />
+            <scroll_list.columns
+                label="MaterialID"
+                name="material_id"
+                dynamic_width="true" />
+          </scroll_list>
+        </panel>
+      </panel>
+    </panel>
+    <panel
+        border="true"
+        bevel_style="none"
         follows="left|top|right"
-        height="100"
         layout="topleft"
+        label="Viewable objects"
+        height="167"
         top_pad="10"
-        left="0"
-        tab_stop="false"
-        multi_select="true"
-        name="post_scroll_list"
         width="1220">
-      <scroll_list.columns
-          label="Material ID"
-          name="id"
-          dynamic_width="true" />
-      <scroll_list.columns
-          label="Normal Map"
-          name="normal_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Map"
-          name="specular_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Color"
-          name="specular_color"
-          width="120" />
-      <scroll_list.columns
-          label="Specular Exponent"
-          name="specular_exponent"
-          width="112" />
-      <scroll_list.columns
-          label="Env Intensity"
-          name="env_intensity"
-          width="80" />
-      <scroll_list.columns
-          label="Alpha Mask Cutoff"
-          name="alpha_mask_cutoff"
-          width="110" />
-      <scroll_list.columns
-          label="Diffuse Alpha Mode"
-          name="diffuse_alpha_mode"
-          width="118" />
-    </scroll_list>
-  </panel>
-  </floater>
+      <panel
+          border="false"
+          bevel_style="none"
+          follows="left|top|right"
+          layout="topleft"
+          left="12"
+          top_pad="10"
+          height="132"
+          width="1220">
+        <button
+            follows="left|top"
+            height="22"
+            label="Post Good Material ID"
+            layout="topleft"
+            name="good_post_button"
+            top_pad="0"
+            width="214"/>
+        <button
+            follows="left|top"
+            height="22"
+            label="Post Bad Material ID"
+            layout="topleft"
+            name="bad_post_button"
+            left_pad="20"
+            width="214"/>
+        <scroll_list
+            column_padding="0"
+            draw_heading="true"
+            follows="left|top|right"
+            height="100"
+            layout="topleft"
+            top_pad="10"
+            left="0"
+            tab_stop="false"
+            multi_select="true"
+            name="post_scroll_list"
+            width="1220">
+          <scroll_list.columns
+              label="Material ID"
+              name="id"
+              dynamic_width="true" />
+          <scroll_list.columns
+              label="Normal Map"
+              name="normal_map"
+              width="225" />
+          <scroll_list.columns
+              label="Specular Map"
+              name="specular_map"
+              width="225" />
+          <scroll_list.columns
+              label="Specular Color"
+              name="specular_color"
+              width="120" />
+          <scroll_list.columns
+              label="Specular Exponent"
+              name="specular_exponent"
+              width="112" />
+          <scroll_list.columns
+              label="Env Intensity"
+              name="env_intensity"
+              width="80" />
+          <scroll_list.columns
+              label="Alpha Mask Cutoff"
+              name="alpha_mask_cutoff"
+              width="110" />
+          <scroll_list.columns
+              label="Diffuse Alpha Mode"
+              name="diffuse_alpha_mode"
+              width="118" />
+        </scroll_list>
+      </panel>
+    </panel>
+  </tab_container>
+</floater>
-- 
cgit v1.2.3


From 002a54f7798761e3cc885253c46f4180c02e49c9 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Mon, 8 Oct 2012 12:05:41 -0700
Subject: Adding new material fields for the GET method.

---
 .../default/xui/en/floater_debug_materials.xml     | 82 ++++++++++++++++++++--
 1 file changed, 77 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 122b5e54e1..0e6e1d7901 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -109,19 +109,91 @@
             top_pad="10"
             tab_stop="false"
             multi_select="true"
-            name="get_scroll_list"
-            width="1220">
+            name="normal_map_attrs_scroll_list"
+            width="1010">
           <scroll_list.columns
               label="Material ID"
               name="id"
-              dynamic_width="true" />
+              width="225" />
           <scroll_list.columns
               label="Normal Map"
-              name="normal_map"
+              name="normal_map_list"
+              width="225" />
+          <scroll_list.columns
+              label="Offset X"
+              name="normal_map_list_offset_x"
+              width="112" />
+          <scroll_list.columns
+              label="Offset Y"
+              name="normal_map_list_offset_y"
+              width="112" />
+          <scroll_list.columns
+              label="Repeat X"
+              name="normal_map_list_repeat_x"
+              width="112" />
+          <scroll_list.columns
+              label="Repeat Y"
+              name="normal_map_list_repeat_y"
+              width="112" />
+          <scroll_list.columns
+              label="Rotation"
+              name="normal_map_list_rotation"
+              width="112" />
+        </scroll_list>
+        <scroll_list
+            column_padding="0"
+            draw_heading="true"
+            follows="left|top|right"
+            height="135"
+            layout="topleft"
+            top_pad="10"
+            tab_stop="false"
+            multi_select="true"
+            name="specular_map_attrs_scroll_list"
+            width="1010">
+          <scroll_list.columns
+              label="Material ID"
+              name="id"
               width="225" />
           <scroll_list.columns
               label="Specular Map"
-              name="specular_map"
+              name="specular_map_list"
+              width="225" />
+          <scroll_list.columns
+              label="Offset X"
+              name="specular_map_list_offset_x"
+              width="112" />
+          <scroll_list.columns
+              label="Offset Y"
+              name="specular_map_list_offset_y"
+              width="112" />
+          <scroll_list.columns
+              label="Repeat X"
+              name="specular_map_list_repeat_x"
+              width="112" />
+          <scroll_list.columns
+              label="Repeat Y"
+              name="specular_map_list_repeat_y"
+              width="112" />
+          <scroll_list.columns
+              label="Rotation"
+              name="specular_map_list_rotation"
+              width="112" />
+        </scroll_list>
+        <scroll_list
+            column_padding="0"
+            draw_heading="true"
+            follows="left|top|right"
+            height="135"
+            layout="topleft"
+            top_pad="10"
+            tab_stop="false"
+            multi_select="true"
+            name="other_data_scroll_list"
+            width="765">
+          <scroll_list.columns
+              label="Material ID"
+              name="id"
               width="225" />
           <scroll_list.columns
               label="Specular Color"
-- 
cgit v1.2.3


From 1db55ab6da9f6fcc9f51d4c09ed5fa2b88afd7c4 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 9 Oct 2012 12:07:35 -0700
Subject: CHUI-393 : Suppress the sort participants by distance from you menu
 item. Kept the code around.

---
 indra/newview/skins/default/xui/en/menu_participant_view.xml | 11 -----------
 1 file changed, 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 0043c14479..6fa0707eea 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -59,17 +59,6 @@
          function="IMFloaterContainer.Check"
          parameter="sort_participants_by_recent" />
     </menu_item_check>
-    <menu_item_check
-     label="Sort participants by distance from you"
-     layout="topleft"
-     name="sort_participants_by_distance">
-        <on_click
-         function="IMFloaterContainer.Action"
-         parameter="sort_participants_by_distance" />
-        <on_check
-         function="IMFloaterContainer.Check"
-         parameter="sort_participants_by_distance" />
-    </menu_item_check>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-- 
cgit v1.2.3


From 38a565f71a54aaa66300a0ab593e366731aac769 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 9 Oct 2012 12:30:38 -0700
Subject: Initial pass at getting a list of viewer objects with non-null
 material IDs.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 0e6e1d7901..17ca0e3450 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -824,6 +824,14 @@
           top_pad="10"
           height="132"
           width="1220">
+        <button
+            follows="left|top"
+            height="22"
+            label="Query Visible Objects"
+            layout="topleft"
+            name="query_visible_object_button"
+            top_pad="0"
+            width="214"/>
         <button
             follows="left|top"
             height="22"
-- 
cgit v1.2.3


From a8642c90dac302cf5d55be23343cc58d48a43b9a Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 9 Oct 2012 16:30:53 -0700
Subject: Adjusting the layout and adding functionality to query the viewerable
 objects with non-null material ids.

---
 .../default/xui/en/floater_debug_materials.xml     | 401 ++++++++++++++-------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   2 +-
 2 files changed, 262 insertions(+), 141 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 17ca0e3450..85743e4501 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -3,12 +3,12 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="680"
-    width="1244"
-    min_height="600"
-    min_width="1100"
+    height="725"
+    width="1030"
+    min_height="750"
+    min_width="1030"
     layout="topleft"
-    name="debug_materials"
+    name="floater_debug_materials"
     reuse_instance="true"
     save_rect="false"
     single_instance="true"
@@ -57,41 +57,31 @@
         width="214">
     </text>
   </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="0"
-      left="12"
-      width="1220"/>
   <tab_container
       follows="left|top|right"
       layout="topleft"
       tab_position="top"
-      name="view_test_tab_container"
       left="10"
       top_pad="10"
-      height="500"
-      width="1220">
+      height="620"
+      width="1010">
     <panel
         border="true"
         bevel_style="none"
         follows="left|top|right"
         layout="topleft"
-        label="Region"
-        height="167"
+        label="Current region"
+        height="620"
         top_pad="10"
-        width="1220">
+        width="1010">
       <panel
           border="false"
           bevel_style="none"
           follows="left|top|right"
           layout="topleft"
-          height="167"
+          height="458"
           top_pad="10"
-          width="1220">
+          width="1010">
         <button
             follows="left|top"
             height="22"
@@ -108,37 +98,33 @@
             layout="topleft"
             top_pad="10"
             tab_stop="false"
-            multi_select="true"
-            name="normal_map_attrs_scroll_list"
-            width="1010">
+            multi_select="false"
+            name="get_other_data_scroll_list"
+            width="765">
           <scroll_list.columns
               label="Material ID"
               name="id"
-              width="225" />
-          <scroll_list.columns
-              label="Normal Map"
-              name="normal_map_list"
-              width="225" />
+              dynamic_width="true" />
           <scroll_list.columns
-              label="Offset X"
-              name="normal_map_list_offset_x"
-              width="112" />
+              label="Specular Color"
+              name="specular_color"
+              width="120" />
           <scroll_list.columns
-              label="Offset Y"
-              name="normal_map_list_offset_y"
+              label="Specular Exponent"
+              name="specular_exponent"
               width="112" />
           <scroll_list.columns
-              label="Repeat X"
-              name="normal_map_list_repeat_x"
-              width="112" />
+              label="Env Intensity"
+              name="env_intensity"
+              width="80" />
           <scroll_list.columns
-              label="Repeat Y"
-              name="normal_map_list_repeat_y"
-              width="112" />
+              label="Alpha Mask Cutoff"
+              name="alpha_mask_cutoff"
+              width="110" />
           <scroll_list.columns
-              label="Rotation"
-              name="normal_map_list_rotation"
-              width="112" />
+              label="Diffuse Alpha Mode"
+              name="diffuse_alpha_mode"
+              width="118" />
         </scroll_list>
         <scroll_list
             column_padding="0"
@@ -148,16 +134,16 @@
             layout="topleft"
             top_pad="10"
             tab_stop="false"
-            multi_select="true"
-            name="specular_map_attrs_scroll_list"
+            multi_select="false"
+            name="get_specular_map_scroll_list"
             width="1010">
           <scroll_list.columns
               label="Material ID"
               name="id"
-              width="225" />
+              dynamic_width="true" />
           <scroll_list.columns
               label="Specular Map"
-              name="specular_map_list"
+              name="specular_map_list_map"
               width="225" />
           <scroll_list.columns
               label="Offset X"
@@ -188,33 +174,37 @@
             layout="topleft"
             top_pad="10"
             tab_stop="false"
-            multi_select="true"
-            name="other_data_scroll_list"
-            width="765">
+            multi_select="false"
+            name="get_normal_map_scroll_list"
+            width="1010">
           <scroll_list.columns
               label="Material ID"
               name="id"
+              dynamic_width="true" />
+          <scroll_list.columns
+              label="Normal Map"
+              name="normal_map_list_map"
               width="225" />
           <scroll_list.columns
-              label="Specular Color"
-              name="specular_color"
-              width="120" />
+              label="Offset X"
+              name="normal_map_list_offset_x"
+              width="112" />
           <scroll_list.columns
-              label="Specular Exponent"
-              name="specular_exponent"
+              label="Offset Y"
+              name="normal_map_list_offset_y"
               width="112" />
           <scroll_list.columns
-              label="Env Intensity"
-              name="env_intensity"
-              width="80" />
+              label="Repeat X"
+              name="normal_map_list_repeat_x"
+              width="112" />
           <scroll_list.columns
-              label="Alpha Mask Cutoff"
-              name="alpha_mask_cutoff"
-              width="110" />
+              label="Repeat Y"
+              name="normal_map_list_repeat_y"
+              width="112" />
           <scroll_list.columns
-              label="Diffuse Alpha Mode"
-              name="diffuse_alpha_mode"
-              width="118" />
+              label="Rotation"
+              name="normal_map_list_rotation"
+              width="112" />
         </scroll_list>
       </panel>
     </panel>
@@ -224,9 +214,9 @@
         follows="left|top|right"
         layout="topleft"
         label="Object editing"
-        height="167"
+        height="620"
         top_pad="10"
-        width="1220">
+        width="1010">
       <panel
           border="false"
           bevel_style="none"
@@ -234,7 +224,7 @@
           layout="topleft"
           left="2"
           top_pad="10"
-          height="410"
+          height="420"
           width="810">
         <panel
             border="false"
@@ -745,11 +735,10 @@
                 left_pad="20"
                 width="214"/>
           </panel>
-
         </panel>
         <view_border
             bevel_style="none"
-            follows="left|right|top"
+            follows="left|top"
             height="0"
             layout="topleft"
             name="horiz_separator"
@@ -812,87 +801,219 @@
         follows="left|top|right"
         layout="topleft"
         label="Viewable objects"
-        height="167"
+        height="620"
         top_pad="10"
-        width="1220">
+        width="1010">
       <panel
           border="false"
           bevel_style="none"
           follows="left|top|right"
           layout="topleft"
-          left="12"
-          top_pad="10"
-          height="132"
-          width="1220">
-        <button
-            follows="left|top"
-            height="22"
-            label="Query Visible Objects"
-            layout="topleft"
-            name="query_visible_object_button"
-            top_pad="0"
-            width="214"/>
-        <button
-            follows="left|top"
-            height="22"
-            label="Post Good Material ID"
+          height="620"
+          top_pad="0"
+          width="1010">
+        <panel
+            border="false"
+            bevel_style="none"
+            follows="left|top|right"
             layout="topleft"
-            name="good_post_button"
-            top_pad="0"
-            width="214"/>
-        <button
-            follows="left|top"
-            height="22"
-            label="Post Bad Material ID"
+            left="0"
+            top_pad="10"
+            height="132"
+            width="835">
+          <button
+              follows="left|top"
+              height="22"
+              label="Query Viewable Objects"
+              layout="topleft"
+              name="query_viewable_objects_button"
+              top_pad="0"
+              width="214"/>
+          <scroll_list
+              column_padding="0"
+              draw_heading="true"
+              follows="left|top|right"
+              height="100"
+              layout="topleft"
+              top_pad="10"
+              left="0"
+              tab_stop="false"
+              multi_select="true"
+              name="viewable_objects_scroll_list"
+              width="835">
+            <scroll_list.columns
+                label="Object ID"
+                name="object_id"
+                width="225" />
+            <scroll_list.columns
+                label="Region"
+                name="region"
+                width="225" />
+            <scroll_list.columns
+                label="Local ID"
+                name="local_id"
+                width="70" />
+            <scroll_list.columns
+                label="Face"
+                name="face_index"
+                width="70" />
+            <scroll_list.columns
+                label="Material ID"
+                name="material_id"
+                dynamic_width="true" />
+          </scroll_list>
+        </panel>
+        <view_border
+            bevel_style="none"
+            follows="left|right|top"
+            height="0"
             layout="topleft"
-            name="bad_post_button"
-            left_pad="20"
-            width="214"/>
-        <scroll_list
-            column_padding="0"
-            draw_heading="true"
+            name="horiz_separator"
+            top_pad="10"
+            left="0"
+            width="1010"/>
+        <panel
+            border="false"
+            bevel_style="none"
             follows="left|top|right"
-            height="100"
             layout="topleft"
+            height="458"
             top_pad="10"
-            left="0"
-            tab_stop="false"
-            multi_select="true"
-            name="post_scroll_list"
-            width="1220">
-          <scroll_list.columns
-              label="Material ID"
-              name="id"
-              dynamic_width="true" />
-          <scroll_list.columns
-              label="Normal Map"
-              name="normal_map"
-              width="225" />
-          <scroll_list.columns
-              label="Specular Map"
-              name="specular_map"
-              width="225" />
-          <scroll_list.columns
-              label="Specular Color"
-              name="specular_color"
-              width="120" />
-          <scroll_list.columns
-              label="Specular Exponent"
-              name="specular_exponent"
-              width="112" />
-          <scroll_list.columns
-              label="Env Intensity"
-              name="env_intensity"
-              width="80" />
-          <scroll_list.columns
-              label="Alpha Mask Cutoff"
-              name="alpha_mask_cutoff"
-              width="110" />
-          <scroll_list.columns
-              label="Diffuse Alpha Mode"
-              name="diffuse_alpha_mode"
-              width="118" />
-        </scroll_list>
+            width="1010">
+          <button
+              follows="left|top"
+              height="22"
+              label="Post Good Material ID"
+              layout="topleft"
+              name="good_post_button"
+              top_pad="0"
+              width="214"/>
+          <button
+              follows="left|top"
+              height="22"
+              label="Post Bad Material ID"
+              layout="topleft"
+              name="bad_post_button"
+              left_pad="20"
+              width="214"/>
+          <scroll_list
+              column_padding="0"
+              draw_heading="true"
+              follows="left|top|right"
+              height="135"
+              layout="topleft"
+              top_pad="10"
+              left="0"
+              tab_stop="false"
+              multi_select="false"
+              name="post_other_data_scroll_list"
+              width="765">
+            <scroll_list.columns
+                label="Material ID"
+                name="id"
+                dynamic_width="true" />
+            <scroll_list.columns
+                label="Specular Color"
+                name="specular_color"
+                width="120" />
+            <scroll_list.columns
+                label="Specular Exponent"
+                name="specular_exponent"
+                width="112" />
+            <scroll_list.columns
+                label="Env Intensity"
+                name="env_intensity"
+                width="80" />
+            <scroll_list.columns
+                label="Alpha Mask Cutoff"
+                name="alpha_mask_cutoff"
+                width="110" />
+            <scroll_list.columns
+                label="Diffuse Alpha Mode"
+                name="diffuse_alpha_mode"
+                width="118" />
+          </scroll_list>
+          <scroll_list
+              column_padding="0"
+              draw_heading="true"
+              follows="left|top|right"
+              height="135"
+              layout="topleft"
+              top_pad="10"
+              tab_stop="false"
+              multi_select="false"
+              name="post_specular_map_scroll_list"
+              width="1010">
+            <scroll_list.columns
+                label="Material ID"
+                name="id"
+                dynamic_width="true" />
+            <scroll_list.columns
+                label="Specular Map"
+                name="specular_map_list_map"
+                width="225" />
+            <scroll_list.columns
+                label="Offset X"
+                name="specular_map_list_offset_x"
+                width="112" />
+            <scroll_list.columns
+                label="Offset Y"
+                name="specular_map_list_offset_y"
+                width="112" />
+            <scroll_list.columns
+                label="Repeat X"
+                name="specular_map_list_repeat_x"
+                width="112" />
+            <scroll_list.columns
+                label="Repeat Y"
+                name="specular_map_list_repeat_y"
+                width="112" />
+            <scroll_list.columns
+                label="Rotation"
+                name="specular_map_list_rotation"
+                width="112" />
+          </scroll_list>
+          <scroll_list
+              column_padding="0"
+              draw_heading="true"
+              follows="left|top|right"
+              height="135"
+              layout="topleft"
+              top_pad="10"
+              tab_stop="false"
+              multi_select="false"
+              name="post_normal_map_scroll_list"
+              width="1010">
+            <scroll_list.columns
+                label="Material ID"
+                name="id"
+                dynamic_width="true" />
+            <scroll_list.columns
+                label="Normal Map"
+                name="normal_map_list_map"
+                width="225" />
+            <scroll_list.columns
+                label="Offset X"
+                name="normal_map_list_offset_x"
+                width="112" />
+            <scroll_list.columns
+                label="Offset Y"
+                name="normal_map_list_offset_y"
+                width="112" />
+            <scroll_list.columns
+                label="Repeat X"
+                name="normal_map_list_repeat_x"
+                width="112" />
+            <scroll_list.columns
+                label="Repeat Y"
+                name="normal_map_list_repeat_y"
+                width="112" />
+            <scroll_list.columns
+                label="Rotation"
+                name="normal_map_list_rotation"
+                width="112" />
+          </scroll_list>
+        </panel>
       </panel>
     </panel>
   </tab_container>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8b47f3a25d..2ac7c0dd46 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2619,7 +2619,7 @@
               name="DebugMaterialsMenu">
             <menu_item_call.on_click
                 function="Floater.ToggleOrBringToFront"
-                parameter="debug_materials" />
+                parameter="floater_debug_materials" />
           </menu_item_call>
 
           <menu_item_separator />
-- 
cgit v1.2.3


From 8a8339a9a85b930bb01f98f4f99f28082a476309 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 9 Oct 2012 17:19:24 -0700
Subject: Adding a reset inputs button to the edit tab.

---
 indra/newview/skins/default/xui/en/floater_debug_materials.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 85743e4501..e2e197a14e 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -716,7 +716,7 @@
               height="22"
               left="0"
               top_pad="110"
-              width="450">
+              width="810">
             <button
                 follows="left|top"
                 height="22"
@@ -734,6 +734,14 @@
                 name="put_clear_button"
                 left_pad="20"
                 width="214"/>
+            <button
+                follows="left|top"
+                height="22"
+                label="Reset Input Values"
+                layout="topleft"
+                name="reset_put_values_button"
+                left_pad="146"
+                width="214"/>
           </panel>
         </panel>
         <view_border
-- 
cgit v1.2.3


From 0ea99ea01fc12fa0210a61a3664ff828d3984575 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 10 Oct 2012 14:07:30 -0700
Subject: Adding a setting to allow user to edit the specular color alpha.

---
 .../default/xui/en/floater_debug_materials.xml     | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index e2e197a14e..504a52e762 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -572,7 +572,7 @@
               bevel_style="none"
               follows="left|top|right"
               layout="topleft"
-              height="132"
+              height="162"
               top_pad="-226"
               left_pad="20"
               width="243">
@@ -603,6 +603,22 @@
                 name="specular_color"
                 tool_tip="Click to open color picker"
                 width="40" />
+            <spinner
+                follows="left|top"
+                height="20"
+                initial_value="255"
+                max_val="255"
+                min_val="0"
+                increment="1"
+                decimal_digits="0"
+                allow_text_entry="true"
+                layout="topleft"
+                label_width="160"
+                left="0"
+                top_pad="10"
+                label="Specular Color Alpha"
+                name="specular_color_alpha"
+                width="240" />
             <text
                 height="13"
                 word_wrap="false"
@@ -612,8 +628,8 @@
                 length="1"
                 follows="left|top"
                 layout="topleft"
-                left_pad="-200"
-                top_pad="10"
+                left_pad="-240"
+                top_pad="13"
                 width="160">
               Specular Exponent
             </text>
@@ -715,7 +731,7 @@
               layout="topleft"
               height="22"
               left="0"
-              top_pad="110"
+              top_pad="80"
               width="810">
             <button
                 follows="left|top"
-- 
cgit v1.2.3


From f609f4cca3a91c8d6ea7c55b61d0b2cfd29be6b7 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 15 Oct 2012 13:55:12 +0300
Subject: CHUI-400 FIXED Disable "Activate Group" menu item if selected group
 is the active group

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 912ff811d9..682d70e4f0 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -117,6 +117,7 @@
      layout="topleft"
      name="activate_group">
         <on_click function="Group.DoToSelected" parameter="activate_group"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_activate_group" />
     </menu_item_call>		
     <menu_item_call
      label="Leave Group"
-- 
cgit v1.2.3


From 1251f45e6246d81658cf4fe6f2654472c772e94b Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 17 Oct 2012 00:16:18 +0300
Subject: CHUI-394 FIXED Group moderation tools missing in right click menus

---
 .../skins/default/xui/en/menu_conversation.xml     | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 682d70e4f0..2e9bda5804 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -125,4 +125,49 @@
      name="leave_group">
         <on_click function="Group.DoToSelected" parameter="leave_group"/>
     </menu_item_call>
+	<menu_item_separator
+	 layout="topleft"
+	 name="Moderator Options Separator"/>
+	<context_menu
+	 label="Moderator Options"
+	 layout="topleft"
+	 name="Moderator Options">
+		<menu_item_check
+		 label="Allow text chat"
+		 layout="topleft"
+		 name="AllowTextChat">
+			<on_check function="Avatar.CheckItem" parameter="is_allowed_text_chat" />
+			<on_click function="Avatar.DoToSelected" parameter="toggle_allow_text_chat" />
+			<on_enable function="Avatar.EnableItem" parameter="can_allow_text_chat" />
+		</menu_item_check>
+		<menu_item_separator layout="topleft" name="moderate_voice_separator" />
+		<menu_item_call
+		 label="Mute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceMuteSelected">
+			<on_click function="Avatar.DoToSelected" parameter="selected" />
+			<on_enable function="Avatar.EnableItem" parameter="can_mute" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Unmute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceUnMuteSelected">
+			<on_click function="Avatar.DoToSelected" parameter="selected" />
+			<on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Mute everyone"
+		 layout="topleft"
+		 name="ModerateVoiceMute">
+			<on_click function="Avatar.DoToSelected" parameter="mute_all" />
+			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Unmute everyone"
+		 layout="topleft"
+		 name="ModerateVoiceUnmute">
+			<on_click function="Avatar.DoToSelected" parameter="unmute_all" />
+			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
+		</menu_item_call>
+	</context_menu>
 </toggleable_menu>
-- 
cgit v1.2.3


From 05a72687d848c13754039f6e720a137827533fdb Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 17 Oct 2012 14:55:36 -0700
Subject: CHUI-410: Now when a converation floater is focused the default text
 'To <Some User>' displays only when the text input field is empty.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 8cd0463de8..2b542595c5 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -255,11 +255,12 @@
              bottom="0"
              expand_lines_count="5"
              follows="left|right|bottom"
-	         font="SansSerifSmall"
+	           font="SansSerifSmall"
              visible="true"
              height="20"
              is_expandable="true"
              label="To"
+             text_tentative_color="TextFgTentativeColor"
              layout="bottomleft"
              name="chat_editor"
              max_length="1023"
-- 
cgit v1.2.3


From ab38c854c34ada4fc166487b980fa2137badfdb9 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Wed, 17 Oct 2012 16:43:56 -0700
Subject: MAINT-1724 : Viewer crashes while attempt to open '+ inventory'
 floater that already opened in separated floater.  Changed to non-tearable
 menu. Reviewed by Kelly

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index e91f5af3d5..29720a680b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  left="0"
  mouse_opaque="false"
- can_tear_off="true"
+ can_tear_off="false"
  name="menu_inventory_add"
  visible="false">
             <menu
-- 
cgit v1.2.3


From 2301c7cff60eca879f605a3ee3f26b960597d8c3 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 18 Oct 2012 13:16:00 -0700
Subject: CHUI-329: Post code review commit, instead of hard coded the
 parenthesis, created a custom string in string.xml. The reasoning for this is
 because some languages may not use the parenthesis or perhaps even use
 brackets if needed...basically allows for flexibility.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 696c282887..01da0a3686 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -385,6 +385,7 @@ Please try logging in again in a minute.</string>
 
 	<!-- Chat -->
 	<string name="NearbyChatTitle">Nearby chat</string>
+  <string name="NearbyChatLabel">(Nearby chat)</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>
-- 
cgit v1.2.3


From 48b2dbcd65e72994054b9e525c0e45e346a981fb Mon Sep 17 00:00:00 2001
From: voidpointer <none@none>
Date: Thu, 18 Oct 2012 15:11:22 -0700
Subject: MAINT-1615 - Something invisible pushes avatars around on Dore

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 232ed2dcb4..c32e23d553 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9960,5 +9960,12 @@ Inventory creation on in-world object failed.
 An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="LargePrimAgentIntersect"
+   type="notify">
+   <tag>fail</tag>
+Cannot create large prims that intersect other players.  Please re-try when other players have moved.
+  </notification>
 
 </notifications>
-- 
cgit v1.2.3


From 68815045a629eeb0e4ab33c05d3773d272eafb50 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 24 Oct 2012 13:18:41 -0700
Subject: CHUI-441 : WIP : Initial refactor part 2. Works but the list doesn't
 update in the torn off dialog.

---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 12 ------------
 1 file changed, 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 2b542595c5..84fba0a3b3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -158,18 +158,6 @@
       width="150" 
       height="310" 
       auto_resize="false">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="310"
-             ignore_online_status="true"
-        layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="150" />
       </layout_panel>
     <layout_panel
        default_tab_group="3"
-- 
cgit v1.2.3


From ec57bd2f8e2859787b274c118fabbc19f76e04b1 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 30 Oct 2012 16:28:57 -0700
Subject: CHUI-461: Changing the default floater opacities according to Leo's
 guidelines.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 2b22f0d6e3..9e825fe516 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -362,7 +362,7 @@
    follows="left|top"
    height="16"
    increment="0.01"
-   initial_value="0.8"
+   initial_value="1.0"
    layout="topleft"
    label_width="115"
    label="Active:"
@@ -380,7 +380,7 @@
    follows="left|top"
    height="16"
    increment="0.01"
-   initial_value="0.5"
+   initial_value="0.95"
    layout="topleft"
    label_width="115"
    label="Inactive:"
-- 
cgit v1.2.3


From 9d9853082361b35987a70574b422c40e8ee04d93 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 30 Oct 2012 18:20:28 -0700
Subject: CHUI-471: Adjusted conversationview so that indentation of the avatar
 icon is dependent upon getIndentation() instead of modifying avatar icon's
 left value.

---
 .../skins/default/xui/en/widgets/conversation_view_participant.xml      | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index 0024decd4c..b83d9122f7 100755
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <conversation_view_participant
   folder_arrow_image="Folder_Arrow"
-  folder_indentation="0"
   item_height="24" 
   item_top_pad="0"
   selection_image="Rounded_Square"
@@ -20,7 +19,6 @@
      height="20"
      default_icon_name="Generic_Person"
 	 layout="topleft"
-     left="50"
 	 top="2"
      width="20" />
 <info_button
-- 
cgit v1.2.3


From 2126cdb9a25da4dcc4c81659038b85bcff17c4ee Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Wed, 31 Oct 2012 15:05:52 -0700
Subject: MAINT-1560 : Make Slow Motion Animations affect all avatars.  Added
 new menu. Reviewed by Kelly

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 44 +++++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 59d268c53a..0fc1982a86 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3178,6 +3178,40 @@
                      parameter="AllowSelectAvatar" />
                 </menu_item_check>
             </menu>
+            <menu
+             create_jump_keys="true"
+             label="Animation Speed"
+             name="Animation Speed"
+             tear_off="true">
+                <menu_item_call
+                 label="All Animations 10% Faster"
+                 name="All Animations 10 Faster">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimTenFaster" />
+                </menu_item_call>
+                <menu_item_call
+                 label="All Animations 10% Slower"
+                 name="All Animations 10 Slower">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimTenSlower" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Reset All Animation Speed"
+                 name="Reset All Animation Speed">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimResetAll" />
+                </menu_item_call>
+				<menu_item_check
+				 label="Slow Motion Animations"
+				 name="Slow Motion Animations">
+					<menu_item_check.on_check
+					 function="CheckControl"
+					 parameter="SlowMotionAnimation" />
+					<menu_item_check.on_click
+					 function="ToggleControl"
+					 parameter="SlowMotionAnimation" />
+				</menu_item_check>
+            </menu>
             <menu_item_call
              label="Force Params to Default"
              name="Force Params to Default">
@@ -3194,16 +3228,6 @@
                  function="Advanced.ToggleAnimationInfo"
                  parameter="" />
             </menu_item_check>
-            <menu_item_check
-             label="Slow Motion Animations"
-             name="Slow Motion Animations">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="SlowMotionAnimation" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="SlowMotionAnimation" />
-            </menu_item_check>
             <menu_item_check
              label="Show Look At"
              name="Show Look At">
-- 
cgit v1.2.3


From cf1019859def2af4414def7991e95a9020b0688f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 21 Feb 2013 16:47:52 -0500
Subject: add use of v1.1 update request protocol, with fallback to v1.0

---
 .../skins/default/xui/en/panel_preferences_setup.xml        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 4aeea8823e..2fb6a9fd40 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -232,6 +232,19 @@
          name="Install_manual"
          value="0" />
   </combo_box>
+  <check_box
+    top_delta="4"
+    enabled="true"
+    follows="left|top"
+    height="14"
+    initial_value="true"
+    control_name="UpdateWillingToTest"
+    label="Willing to update to release candidates"
+    left_delta="0"
+    mouse_opaque="true"
+    name="update_willing_to_test"
+    width="400"           
+    top_pad="5"/>
   <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 49ed1a4e32013cda716998784338a01b12c663ef Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 27 Feb 2013 17:40:39 -0500
Subject: finish changes to update handling, including notices of channel
 changes

---
 .../newview/skins/default/xui/en/notifications.xml | 66 +++++++++++++++++++++-
 1 file changed, 63 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8f5cbb2b0..2319729339 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3452,7 +3452,7 @@ or you can install it now.
    name="DownloadBackgroundTip"
    type="notify">
 We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+Version [VERSION] [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
@@ -3465,7 +3465,7 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
  name="DownloadBackgroundDialog"
  type="alertmodal">
 We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+Version [VERSION] [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
@@ -3478,7 +3478,7 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
  name="RequiredUpdateDownloadedVerboseDialog"
  type="alertmodal">
 We have downloaded a required software update.
-Version [VERSION]
+Version [VERSION] [[INFO_URL] Information about this update]
 
 We must restart [APP_NAME] to install the update.
     <tag>confirm</tag>
@@ -3492,6 +3492,66 @@ We must restart [APP_NAME] to install the update.
  name="RequiredUpdateDownloadedDialog"
  type="alertmodal">
 We must restart [APP_NAME] to install the update.
+[[INFO_URL] Information about this update]
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OtherChannelDownloadBackgroundTip"
+   type="notify">
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION] 
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] for details about this update]
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="OtherChannelDownloadBackgroundDialog"
+ type="alertmodal">
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION]
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] Information about this update]
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
+  </notification>
+  
+  <notification
+ icon="alertmodal.tga"
+ name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
+ type="alertmodal">
+We have downloaded a required software update.
+Version [VERSION]
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] Information about this update]
+
+We must restart [APP_NAME] to install the update.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+ icon="alertmodal.tga"
+ name="OtherChannelRequiredUpdateDownloadedDialog"
+ type="alertmodal">
+We must restart [APP_NAME] to install the update.
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
      name="okbutton"
-- 
cgit v1.2.3


From 0f1c2f8aba148aa7e594d4c9e1bc6a95d34bd99b Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 1 Nov 2012 14:55:47 -0700
Subject: CHUI-472: Problem: Only the converation panel was user/auto
 resizeable but the participants panel was not. By one have only resizable
 this prevented both panels from being resized. Solution: Now set the
 participants panel to be user/auto resizable as well.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 84fba0a3b3..a889eb7933 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,7 +14,7 @@
  width="394"
  can_resize="true"
  can_tear_off="false"
- min_width="250"
+ min_width="340"
  min_height="190"
  positioning="relative">
     <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
@@ -157,7 +157,8 @@
       min_width="115"
       width="150" 
       height="310" 
-      auto_resize="false">
+      user_resize="true"
+      auto_resize="true">
       </layout_panel>
     <layout_panel
        default_tab_group="3"
@@ -171,7 +172,8 @@
        user_resize="true"
        auto_resize="true"
        visible="true"
-       name="left_part_holder">
+       name="left_part_holder"
+       min_width="225">
         <panel
          name="trnsAndChat_panel"
          follows="all"
-- 
cgit v1.2.3


From 34f561c853fd672309aee340b8b0c4e3e9ed6196 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 1 Nov 2012 17:49:49 -0700
Subject: NORSPEC-8: Adding ability to parse GET data over multiple frames to
 avoid viewer timeout and crash on regions with large numbers of materials.

---
 .../default/xui/en/floater_debug_materials.xml     | 63 ++++++++++++++++------
 1 file changed, 47 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 504a52e762..cdc1e63ce1 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -4,9 +4,9 @@
     can_tear_off="false"
     can_resize="true"
     height="725"
-    width="1030"
+    width="1040"
     min_height="750"
-    min_width="1030"
+    min_width="1040"
     layout="topleft"
     name="floater_debug_materials"
     reuse_instance="true"
@@ -20,6 +20,8 @@
   <floater.string name="status_request_completed">Request received.</floater.string>
   <floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string>
   <floater.string name="status_error">An error occurred during the request.</floater.string>
+  <floater.string name="loading_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
+  <floater.string name="loading_status_done">Complete</floater.string>
   <panel
       border="false"
       bevel_style="none"
@@ -64,7 +66,7 @@
       left="10"
       top_pad="10"
       height="620"
-      width="1010">
+      width="1020">
     <panel
         border="true"
         bevel_style="none"
@@ -73,15 +75,15 @@
         label="Current region"
         height="620"
         top_pad="10"
-        width="1010">
+        width="1020">
       <panel
           border="false"
           bevel_style="none"
           follows="left|top|right"
           layout="topleft"
-          height="458"
+          height="479"
           top_pad="10"
-          width="1010">
+          width="1020">
         <button
             follows="left|top"
             height="22"
@@ -90,17 +92,46 @@
             name="get_button"
             top_pad="0"
             width="214"/>
+        <text
+            height="13"
+            word_wrap="true"
+            use_ellipses="false"
+            type="string"
+            text_color="LabelTextColor"
+            length="1"
+            follows="left|top"
+            layout="topleft"
+            left="2"
+            top_pad="8"
+            width="150">
+          Loading Status
+        </text>
+        <text
+            height="13"
+            word_wrap="true"
+            use_ellipses="false"
+            type="string"
+            text_color="MaterialGoodColor"
+            length="1"
+            follows="left|top"
+            layout="topleft"
+            left_pad="0"
+            name="loading_status"
+            top_pad="-13"
+            width="400">
+        </text>
         <scroll_list
             column_padding="0"
             draw_heading="true"
             follows="left|top|right"
             height="135"
             layout="topleft"
+            left="0"
             top_pad="10"
             tab_stop="false"
             multi_select="false"
             name="get_other_data_scroll_list"
-            width="765">
+            width="775">
           <scroll_list.columns
               label="Material ID"
               name="id"
@@ -136,7 +167,7 @@
             tab_stop="false"
             multi_select="false"
             name="get_specular_map_scroll_list"
-            width="1010">
+            width="1020">
           <scroll_list.columns
               label="Material ID"
               name="id"
@@ -176,7 +207,7 @@
             tab_stop="false"
             multi_select="false"
             name="get_normal_map_scroll_list"
-            width="1010">
+            width="1020">
           <scroll_list.columns
               label="Material ID"
               name="id"
@@ -827,7 +858,7 @@
         label="Viewable objects"
         height="620"
         top_pad="10"
-        width="1010">
+        width="1020">
       <panel
           border="false"
           bevel_style="none"
@@ -835,7 +866,7 @@
           layout="topleft"
           height="620"
           top_pad="0"
-          width="1010">
+          width="1020">
         <panel
             border="false"
             bevel_style="none"
@@ -895,7 +926,7 @@
             name="horiz_separator"
             top_pad="10"
             left="0"
-            width="1010"/>
+            width="1020"/>
         <panel
             border="false"
             bevel_style="none"
@@ -903,7 +934,7 @@
             layout="topleft"
             height="458"
             top_pad="10"
-            width="1010">
+            width="1020">
           <button
               follows="left|top"
               height="22"
@@ -931,7 +962,7 @@
               tab_stop="false"
               multi_select="false"
               name="post_other_data_scroll_list"
-              width="765">
+              width="775">
             <scroll_list.columns
                 label="Material ID"
                 name="id"
@@ -967,7 +998,7 @@
               tab_stop="false"
               multi_select="false"
               name="post_specular_map_scroll_list"
-              width="1010">
+              width="1020">
             <scroll_list.columns
                 label="Material ID"
                 name="id"
@@ -1007,7 +1038,7 @@
               tab_stop="false"
               multi_select="false"
               name="post_normal_map_scroll_list"
-              width="1010">
+              width="1020">
             <scroll_list.columns
                 label="Material ID"
                 name="id"
-- 
cgit v1.2.3


From e3524a5fe159566edefb0bbc395e94ee3126adec Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 5 Nov 2012 15:53:31 -0800
Subject: CHUI-468 : Suppress LLCallFloater completely

---
 .../default/xui/en/floater_voice_controls.xml      | 155 ---------------------
 1 file changed, 155 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_voice_controls.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
deleted file mode 100644
index dce2720cf8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="cascading"
- can_resize="true"
- can_minimize="true"
- can_close="true"
- chrome="true"
- height="205"
- layout="topleft"
- min_height="124"
- min_width="190"
- name="floater_voice_controls"
- help_topic="floater_voice_controls"
- title="VOICE CONTROLS"
- save_dock_state="true"
- save_visibility="true"
- save_rect="true"
- single_instance="true"
- width="282">
-    <string
-     name="title_nearby">
-        VOICE SETTINGS
-    </string>
-    <string
-     name="title_group">
-        GROUP CALL WITH [GROUP]
-    </string>
-    <string
-     name="title_adhoc">
-        CONFERENCE CALL
-    </string>
-    <string
-     name="title_peer_2_peer">
-        CALL WITH [NAME]
-    </string>
-    <string
-     name="no_one_near">
-        No one near has voice enabled
-    </string>
-      <layout_stack
-         clip="false"
-         follows="all"
-         height="189"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="my_call_stack"
-         orientation="vertical"
-         width="263">
-        <layout_panel
-         follows="top|left|right"
-         auto_resize="false"
-         layout="topleft"
-         min_height="20"
-         height="20"
-         name="my_panel">
-            <avatar_icon
-             enabled="false"
-             follows="left|top"
-             height="18"
-             default_icon_name="Generic_Person"
-             layout="topleft"
-             left="5"
-             name="user_icon"
-             top="0"
-             width="18" />
-            <text
-             follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="user_text"
-             text_color="White"
-             top="4"
-             use_ellipses="true"
-             value="My Avatar:"
-             width="210" />
-            <output_monitor
-             auto_update="true"
-             draw_border="false"
-             follows="top|right"
-             height="16"
-             layout="topleft"
-             right="-3"
-             name="speaking_indicator"
-             left_pad="5"
-             visible="true"
-             width="20" />
-        </layout_panel>
-        <layout_panel name="leave_call_panel" height="26" min_height="26" auto_resize="false">
-        <layout_stack
-         clip="true"
-         follows="left|top|right"
-         height="26"
-         layout="topleft"
-         mouse_opaque="false"
-         name="voice_effect_and_leave_call_stack"
-         orientation="horizontal"
-         width="262">
-          <layout_panel
-            height="26"
-            width="200">
-            <panel
-             class="panel_voice_effect"
-             name="panel_voice_effect"
-             visiblity_control="VoiceMorphingEnabled"
-             filename="panel_voice_effect.xml" />
-          </layout_panel>
-          <layout_panel
-           auto_resize="false"
-           follows="top|right"
-           height="23"
-           visible="true"
-           layout="topleft"
-           name="leave_call_btn_panel"
-           width="100">
-            <button
-             follows="right|top"
-             height="23"
-             label="Leave Call"
-             name="leave_call_btn"
-             width="100" />
-          </layout_panel>
-        </layout_stack>
-          </layout_panel>
-      <layout_panel
-          follows="all"
-          layout="topleft"
-          left="2"
-          top_pad="0"
-          height="132"
-          name="callers_panel"
-          auto_resize="true"
-          width="280">
-        <avatar_list
-         follows="all"
-         height="132"
-         ignore_online_status="true"
-         layout="topleft"
-         multi_select="true"
-         name="speakers_list"
-         width="280" />
-        <panel
-         filename="panel_avatar_list_item.xml"
-         follows="left|right|top"
-         height="24"
-         layout="topleft"
-         left="0"
-         name="non_avatar_caller"
-         top="10"
-         width="276" />
-      </layout_panel>
-    </layout_stack>
-</floater>
-- 
cgit v1.2.3


From 2d9d44e31643214c80bde5ffee03f9b6af6af9d0 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 5 Nov 2012 18:33:39 -0800
Subject: CHUI-468 : WIP : Taking LLAvatarList and related out of
 LLParticipantList

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 56056ed560..771d9fa680 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -90,7 +90,7 @@
 		     layout="topleft"
 		     left_pad="5"
  		     mouse_opaque="true"
- 		     name="speaking_indicatorn"
+ 		     name="speaking_indicator"
  		     visible="false"
  		     width="20" />
         </layout_panel>
-- 
cgit v1.2.3


From 50615ba69c94441c99f21f861cf0290972162998 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 6 Nov 2012 17:56:25 -0800
Subject: CHUI-507: Updated to the new layout of 'Chat Preferences' according
 to CHUI Notifications spec. The functionality for the new preferences is not
 yet implemented.

---
 .../default/xui/en/panel_preferences_chat.xml      | 449 +++++++++++++++------
 1 file changed, 331 insertions(+), 118 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index c76a3cfaaf..28434a670e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -9,151 +9,364 @@
  name="chat"
  top="1"
  width="517">
-  <text
-   follows="left|top"
-   layout="topleft"
-   left="30"
-   height="12"
-   name="font_size"
-   width="120"
-   top="10">
-    Font size:
-  </text>
-  <radio_group
-     height="30"
-     layout="topleft"
-     left="40"
-	 control_name="ChatFontSize"
-     name="chat_font_size"
-     top_pad="0"
-     width="440">
-        <radio_item
-         height="16"
-         label="Small"
-         layout="topleft"
-         left="0"
-         name="radio"
-         value="0"
-         top="10"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Medium"
-         layout="topleft"
-         left_delta="145"
-         name="radio2"
-         value="1"
-         top_delta="0"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Large"
-         layout="topleft"
-         left_delta="170"
-         name="radio3"
-         value="2"
-         top_delta="0"
-         width="125" />
-    </radio_group>
-    
+
+  <panel
+  border="false"
+  follows="left|top"
+  height="90"
+  layout="topleft"
+  top="10"
+  left="13"
+  width="517">
+
     <check_box
-     control_name="PlayTypingAnim"
-     height="16"
-     initial_value="true"
-     label="Play typing animation when chatting"
-     layout="topleft"
-     left="30"
-     name="play_typing_animation"
-     top_pad="10"
-     width="400" />
+       control_name="PlayTypingAnim"
+       height="16"
+       initial_value="true"
+       label="Play typing animation when chatting"
+       layout="topleft"
+       top="0"
+       name="play_typing_animation"
+       width="330" />
     <check_box
      enabled="false"
      height="16"
      label="Email me IMs when I'm offline"
      layout="topleft"
-     left_delta="0"
      name="send_im_to_email"
-     top_pad="5"
-     width="400" />
+     top_pad="6"
+     width="330" />
+    <check_box
+    height="16"
+    label="Keep a conversation log and transcripts"
+    layout="topleft"
+    name="keep_convo_log_and_transcripts"
+    top_pad="6"
+    width="330" />
     <check_box
      control_name="UseChatBubbles"
      follows="left|top"
      height="16"
      label="Bubble Chat"
      layout="topleft"
-     left_delta="0"
-     top_pad="5"
+     top_pad="6"
      name="bubble_text_chat"
-     width="150" />     
+     width="330" />
     <text
-     name="disable_toast_label"
      follows="left|top"
      layout="topleft"
-     top_pad="20" 
-     left="30" 
-     height="10"
-     width="400">
-      Enable incoming chat popups:
-      </text>
-    <check_box
-     control_name="EnableGroupChatPopups"
-     name="EnableGroupChatPopups"
-     label="Group Chats" 
-     layout="topleft"
-     top_pad="5" 
-     left_delta="10" 
-     height="20"
-     tool_tip="Check to see popups when a Group Chat message arrives"
-     width="400" />
-    <check_box
-     control_name="EnableIMChatPopups"
-     name="EnableIMChatPopups"
-     label="IM Chats" 
-     layout="topleft"
-     top_pad="5"
-     height="16"
-     tool_tip="Check to see popups when an instant message arrives"
-     width="400" />
-    <spinner
-     control_name="NearbyToastLifeTime"
-     decimal_digits="0"
+     left="345"
+     height="12"
+     name="font_size"
+     width="120"
+     top="0">
+      Font size:
+    </text>
+    <radio_group
+       height="90"
+       layout="topleft"
+       left="352"
+     control_name="ChatFontSize"
+       name="chat_font_size"
+       top_pad="0"
+       width="50">
+      <radio_item
+       height="16"
+       label="Small"
+       layout="topleft"
+       name="radio"
+       value="0"
+       top="10"
+       width="125" />
+      <radio_item
+       height="16"
+       label="Medium"
+       layout="topleft"
+       name="radio2"
+       value="1"
+       top_pad="6"
+       width="125" />
+      <radio_item
+       height="16"
+       label="Large"
+       layout="topleft"
+       name="radio3"
+       value="2"
+       top_pad="6"
+       width="125" />
+    </radio_group>    
+    
+  </panel>  
+
+  <panel
+  border="false"
+  follows="left|top"
+  height="193"
+  layout="topleft"
+  left="13"
+  width="517">
+
+    <text
      follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="23"
-     label="Nearby chat toasts life time:"
-     label_width="285"
      layout="topleft"
-     left="45"
-     max_val="60"
-     min_val="1"
-     name="nearby_toasts_lifetime"
-     top_pad="10"
-     width="325" />
-    <spinner
-     control_name="NearbyToastFadingTime"
-     decimal_digits="0"
+     height="12"
+     name="notifications"
+     left="0"
+     width="120">
+      Notifications:
+    </text>
+    <text
      follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="3"
-     label="Nearby chat toasts fading time:"
-     label_width="285"
      layout="topleft"
-     left_delta="0"
-     max_val="60"
-     min_val="0"
-     name="nearby_toasts_fadingtime"
-     top_pad="3"
-     width="325" />
+     height="12"
+     name="friend_ims"
+     width="145"
+     left="0"
+     top_pad="15"
+     >
+      Friend IMs:
+    </text>
+    <combo_box
+             control_name="NotificationFriendIMOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="FriendIMOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+        follows="left|top"
+        layout="topleft"
+        height="12"
+        name="non_friend_ims"
+        width="145"
+        left="0"
+     top_pad="15"
+     >
+      Non-friend IMs:
+    </text>
+    <combo_box
+             control_name="NotificationNonFriendIMOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="NonFriendIMOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+          follows="left|top"
+          layout="topleft"
+          left="0"
+          height="13"
+          name="conference_ims"
+          width="145"
+          top_pad="14"
+     >
+      Conference IMs:
+    </text>
+    <combo_box
+             control_name="NotificationConferenceIMOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="ConferenceIMOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+          follows="left|top"
+          layout="topleft"
+          left="0"
+          height="13"
+          name="group_chat"
+          width="145"
+          top_pad="14"
+     >
+      Group chat:
+    </text>
+    <combo_box
+             control_name="NotificationGroupChatOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="GroupChatOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+            follows="left|top"
+            layout="topleft"
+            left="0"
+            height="12"
+            name="nearby_chat"
+            width="145"
+            top_pad="14"
+     >
+      Nearby chat:
+    </text>
+    <combo_box
+             control_name="NotificationNearbyChatOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="NearbyChatOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+            follows="left|top"
+            layout="topleft"
+            left="0"
+            height="12"
+            name="notifications_alert"
+            width="350"
+            top_pad="11"
+            visible="true"
+            text_color="DrYellow"
+     >
+      To temporarily stop all notifications, use Me > Status > Busy.
+    </text>
+
+  </panel>
+
+  <panel
+  border="false"
+  follows="left|top"
+  height="1"
+  layout="topleft"
+  left="13"
+  width="517">
+
+    <text
+      follows="left|top"
+      layout="topleft"
+      left="0"
+      name="play_sound"
+      width="100"
+      top_pad="13"
+      visible="true">
+      Play sound:
+    </text>
+    <check_box
+         control_name="NewConversation"
+         height="16"
+         initial_value="true"
+         label="New conversation"
+         layout="topleft"
+         left_pad="15"
+         top_pad="-10"
+         name="new_conversation"
+         width="150" />
+    <check_box
+         control_name="IncomingVoiceCall"
+         height="16"
+         initial_value="true"
+         label="Incoming voice call"
+         layout="topleft"
+         top_pad="6"
+         name="incoming_voice_call"
+         width="150" />
+    <check_box
+         control_name="GroupChatMessages"
+         height="16"
+         initial_value="false"
+         label="Group chat messages"
+         layout="topleft"
+         top_pad="6"
+         name="group_chat_messages"
+         width="150" />
+    <check_box
+         control_name="TeleportOffer"
+         height="16"
+         initial_value="true"
+         label="Teleport offer"
+         layout="topleft"
+         left_pad="35"
+         top_pad="-59"
+         name="teleport_offer"
+         width="150" />
+    <check_box
+         control_name="InventoryOffer"
+         height="16"
+         initial_value="false"
+         label="Inventory offer"
+         layout="topleft"
+         top_pad="6"
+         name="inventory_offer"
+         width="150" />
+
+  </panel>
+    
   <button
    follows="left|top"
    height="23"
    label="Translation..."
    layout="topleft"
-   left="30"
+   left="9"
    name="ok_btn"
-   top="-50"
+   top="-29"
    width="170">
    <button.commit_callback
     function="Pref.TranslationSettings" />
-- 
cgit v1.2.3


From 18011db7f0b60e4ec499e3cbdda4e4f716f458a2 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 6 Nov 2012 15:47:08 -0800
Subject: Altering the line item phone icon.

---
 indra/newview/skins/default/xui/en/panel_conversation_list_item.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 56056ed560..67feade9a3 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -54,14 +54,14 @@
          visible="false"
          width="20">
             <icon
-             height="20"
+             height="18"
              follows="top|right|left"
              image_name="Conv_toolbar_open_call"
              layout="topleft"
              left="0"
              name="selected_icon"
-             top="2"
-             width="20" />
+             top="3"
+             width="18" />
         </layout_panel>
         <layout_panel
          auto_resize="true"
-- 
cgit v1.2.3


From c4eaaa3d6a08330863119d550d365315ba7526bb Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 8 Nov 2012 12:35:15 -0800
Subject: CHUI-484: Updating the code to rather than refer to it as Busy Mode,
 it now refers to it as Do Not Disturb mode.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml         |  4 ++--
 indra/newview/skins/default/xui/en/notifications.xml       | 14 +++++++-------
 .../skins/default/xui/en/panel_preferences_general.xml     |  4 ++--
 indra/newview/skins/default/xui/en/strings.xml             |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c805b6db42..f6a307d9d0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -138,9 +138,9 @@
         </menu_item_call>
         <menu_item_call
          label="Busy"
-         name="Set Busy">
+         name="set_do_not_disturb">
           <menu_item_call.on_click
-           function="World.SetBusy"/>
+           function="World.SetDoNotDisturb"/>
         </menu_item_call>
       </menu>
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4410f41e29..1c1642abac 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3691,12 +3691,12 @@ Cannot offer friendship at this time. Please try again in a moment.
 
   <notification
    icon="alert.tga"
-   name="BusyModeSet"
+   name="DoNotDisturbModeSet"
    type="alert">
 Busy mode is set.
 Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
     <usetemplate
-     ignoretext="I change my status to Busy mode"
+     ignoretext="I change my status to Do Not Disturb mode"
      name="okignore"
      yestext="OK"/>
   </notification>
@@ -5167,8 +5167,8 @@ Do you want to replace it with the selected object?
 
   <notification
    icon="alert.tga"
-   label="Busy Mode Warning"
-   name="BusyModePay"
+   label="Do Not Disturb Mode Warning"
+   name="DoNotDisturbModePay"
    type="alert">
 You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
 
@@ -5177,15 +5177,15 @@ Would you like to leave Busy Mode before completing this transaction?
     <form name="form">
       <ignore name="ignore"
        save_option="true"
-       text="I am about to pay a person or object while I am in Busy mode"/>
+       text="I am about to pay a person or object while I am in Do Not Disturb mode"/>
       <button
        default="true"
-       ignore="Always leave Busy Mode"
+       ignore="Always leave Do Not Disturb Mode"
        index="0"
        name="Yes"
        text="OK"/>
       <button
-       ignore="Never leave Busy Mode"
+       ignore="Never leave Do Not Disturb Mode"
        index="1"
        name="No"
        text="Cancel"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 24882988b0..2cb063e8ee 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -412,7 +412,7 @@
        Busy mode response:
     </text>
     <text_editor
-     control_name="BusyModeResponse"
+     control_name="DoNotDisturbModeResponse"
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
@@ -421,7 +421,7 @@
      height="29"
      layout="topleft"
      left="30"
-     name="busy_response"
+     name="do_not_disturb_response"
      width="470"
      word_wrap="true">
        log_in_to_change
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 01da0a3686..04b6326769 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -295,7 +295,7 @@ Please try logging in again in a minute.</string>
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
-	<string name="AvatarBusy">Busy</string>
+	<string name="AvatarDoNotDisturb">Busy</string>
 	<string name="AvatarMuted">Blocked</string>
 
 	<!-- animations -->
@@ -2077,8 +2077,8 @@ For AI Character: Get the closest navigable point to the point provided.
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
 	<string name="AvatarSetAway">Away</string>
-	<string name="AvatarSetNotBusy">Not Busy</string>
-	<string name="AvatarSetBusy">Busy</string>
+	<string name="AvatarSetAvailable">Not Busy</string>
+	<string name="AvatarSetDoNotDisturb">Busy</string>
 
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
@@ -2526,7 +2526,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="PanelContentsNewScript">New Script</string>
 
   <!-- panel preferences general -->
-  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+  <string name="DoNotDisturbModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
 
 	<!-- Mute -->
 	<string name="MuteByName">(By name)</string>
-- 
cgit v1.2.3


From 828374749682a5febc6ebac81321e80dee11085e Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 12 Nov 2012 16:25:35 +0200
Subject: CHUI-386 FIXED Vertical scrollbar not fully showing in conversation
 message panel

---
 .../skins/default/xui/en/floater_im_session.xml    | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index a889eb7933..1d74f1bc25 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -203,7 +203,7 @@
              name="translate_chat_checkbox_lp"
              top_delta="0"
              visible="true"
-             width="230">
+             width="210">
                 <check_box
                  top="10"
                  control_name="TranslateChat"
@@ -217,7 +217,7 @@
             </layout_panel>
             <layout_panel
              height="248"
-             width="230"
+             width="210"
              layout="topleft"
              follows="all"
              left_delta="0"
@@ -227,17 +227,17 @@
              user_resize="true"
              auto_resize="true"
              name="chat_holder">      
-        <chat_history
-	 font="SansSerifSmall"
-             		follows="all"
-             		visible="true"
-             		height="240"
-         name="chat_history"
-         parse_highlights="true"
-         parse_urls="true"
-       	 width="230"
-       	 left="5">
-        </chat_history>
+               <chat_history
+                font="SansSerifSmall"
+                follows="all"
+                visible="true"
+                height="240"
+                name="chat_history"
+                parse_highlights="true"
+                parse_urls="true"
+                right="-5"
+                left="5">
+               </chat_history>
             </layout_panel>
            </layout_stack>
            </panel>
-- 
cgit v1.2.3


From 3d42133ecb7671d8284bc0309f8df9e6e7f2df9c Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 9 Nov 2012 17:04:21 +0200
Subject: CHUI-362 WIP (Torn off conversation name is highlighted when selected
 in conversation list with different conversation showing in message panel):
 implemented the stub panel and a control of it's visibility

---
 .../skins/default/xui/en/floater_im_container.xml  | 42 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 590ce45c33..e3db3d52ed 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -124,7 +124,47 @@
              left="0"
              name="im_box_tab_container"
              top="0"
-             width="412"/>
+             width="412">
+             <panel
+               follows="all"
+               layout="topleft"
+               name="stub_panel"
+               opaque="true"
+               top_pad="0"
+               left="0"
+               height="430"
+               width="412">
+                 <text
+                   type="string"
+                   clip_partial="false"
+                   follows="left|top"
+                   layout="topleft"
+                   left="20"
+                   right="-20"
+                   name="stub_textbox_1"
+                   top="10"
+                   height="20"
+                   valign="center"
+                   wrap="true">
+                   This conversation is in a separate window.
+                 </text>
+                 <text
+                   type="string"
+                   clip_partial="false"
+                   follows="left|top"
+                   layout="topleft"
+                   left="20"
+                   right="-20"
+                   name="stub_textbox_2"
+                   top="40"
+                   height="20"
+                   valign="center"
+                   parse_urls="false"
+                   wrap="true">
+                     Bring it back.
+                </text>
+             </panel>
+            </panel_container>
         </layout_panel>
     </layout_stack>
 </multi_floater>
-- 
cgit v1.2.3


From 4f58b4088a469d907eb33f1e338569016ba4c1f1 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 14:41:50 -0800
Subject: CHUI-517: Altering the behavior and copy of the main menu status
 choices.  Busy has been replaced with Do Not Disturb.  And both status
 options have been switched to be indicated with a check rather than
 alternating text.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 37 ++++++++++++++--------
 indra/newview/skins/default/xui/en/strings.xml     |  6 ----
 2 files changed, 24 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f6a307d9d0..b1e3a2d41f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -130,19 +130,22 @@
        label="Status"
        name="Status"
        tear_off="true">
-        <menu_item_call
-         label="Away"
-         name="Set Away">
-          <menu_item_call.on_click
+        <menu_item_check
+         label="Away">
+          <menu_item_check.on_check
+           function="View.Status.CheckAway" />
+          <menu_item_check.on_click
            function="World.SetAway" />
-        </menu_item_call>
-        <menu_item_call
-         label="Busy"
-         name="set_do_not_disturb">
-          <menu_item_call.on_click
+        </menu_item_check>
+        <menu_item_check
+         label="Do Not Disturb">
+          <menu_item_check.on_check
+           function="View.Status.CheckDoNotDisturb" />
+          <menu_item_check.on_click
            function="World.SetDoNotDisturb"/>
-        </menu_item_call>
-      </menu>
+        </menu_item_check>
+      
+    </menu>
 
       <menu_item_separator/>
 
@@ -254,8 +257,7 @@
              parameter="speak" />
         </menu_item_check>
         <menu_item_check
-         label="Conversations Log..."
-         name="ConversationsLog">
+         label="Conversation Log...">
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="conversation" />
@@ -318,6 +320,15 @@
               function="SideTray.PanelPeopleTab"
               parameter="blocked_panel" />
         </menu_item_call>
+      <menu_item_separator/>
+      <menu_item_check
+       label="Do Not Disturb">
+        <menu_item_check.on_check
+         function="View.Status.CheckDoNotDisturb" />
+        <menu_item_check.on_click
+         function="World.SetDoNotDisturb"/>
+      </menu_item_check>
+
     </menu>
     <menu
      create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 04b6326769..f873bfe6c7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2074,12 +2074,6 @@ For AI Character: Get the closest navigable point to the point provided.
 	</string>
 
 
-  <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Not Away</string>
-	<string name="AvatarSetAway">Away</string>
-	<string name="AvatarSetAvailable">Not Busy</string>
-	<string name="AvatarSetDoNotDisturb">Busy</string>
-
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
 	<string name="skin">Skin</string>
-- 
cgit v1.2.3


From 69f81d5bb6390ed4b3c766fc64605d6f15d5df31 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 14:58:37 -0800
Subject: CHUI-517: Updating the do not disturb message automatically sent to
 other users when they attempt to contact a person in do not disturb mode.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f873bfe6c7..79ee83969b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2520,7 +2520,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="PanelContentsNewScript">New Script</string>
 
   <!-- panel preferences general -->
-  <string name="DoNotDisturbModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+  <string name="DoNotDisturbModeResponseDefault">This resident has turned on &apos;Do Not Disturb&apos; and will see your message later.</string>
 
 	<!-- Mute -->
 	<string name="MuteByName">(By name)</string>
-- 
cgit v1.2.3


From 873057a21aaa4e21d75998f604119024947ac773 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 15:45:07 -0800
Subject: CHUI-517: Updating notification copy for Do Not Disturb mode.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1c1642abac..d63c91a0e6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3693,8 +3693,11 @@ Cannot offer friendship at this time. Please try again in a moment.
    icon="alert.tga"
    name="DoNotDisturbModeSet"
    type="alert">
-Busy mode is set.
-Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
+Do Not Disturb is on.  You will not be notified of incoming communications.
+
+- Other residents will receive your Do Not Disturb response (set in Preferences &gt; General).
+- Teleportation offers will be declined.
+- Inventory offers will go to your Trash.
     <usetemplate
      ignoretext="I change my status to Do Not Disturb mode"
      name="okignore"
@@ -5170,9 +5173,9 @@ Do you want to replace it with the selected object?
    label="Do Not Disturb Mode Warning"
    name="DoNotDisturbModePay"
    type="alert">
-You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
+You have turned on Do Not Disturb. You will not receive any items offered in exchange for this payment.
 
-Would you like to leave Busy Mode before completing this transaction?
+Would you like to turn off Do Not Disturb before completing this transaction?
     <tag>confirm</tag>
     <form name="form">
       <ignore name="ignore"
-- 
cgit v1.2.3


From 312cb2ab61a20fe1e011e41e82bfae5f50fd7a84 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 15:53:58 -0800
Subject: Cleaning up white-space in an xml file.

---
 .../default/xui/en/panel_preferences_chat.xml      | 594 ++++++++++-----------
 1 file changed, 294 insertions(+), 300 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 28434a670e..5524d0e4f0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,151 +1,150 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Text Chat"
- layout="topleft"
- left="102"
- name="chat"
- top="1"
- width="517">
+    border="true"
+    follows="left|top|right|bottom"
+    height="408"
+    label="Text Chat"
+    layout="topleft"
+    left="102"
+    name="chat"
+    top="1"
+    width="517">
 
   <panel
-  border="false"
-  follows="left|top"
-  height="90"
-  layout="topleft"
-  top="10"
-  left="13"
-  width="517">
+      border="false"
+      follows="left|top"
+      height="90"
+      layout="topleft"
+      top="10"
+      left="13"
+      width="517">
 
     <check_box
-       control_name="PlayTypingAnim"
-       height="16"
-       initial_value="true"
-       label="Play typing animation when chatting"
-       layout="topleft"
-       top="0"
-       name="play_typing_animation"
-       width="330" />
+        control_name="PlayTypingAnim"
+        height="16"
+        initial_value="true"
+        label="Play typing animation when chatting"
+        layout="topleft"
+        top="0"
+        name="play_typing_animation"
+        width="330" />
     <check_box
-     enabled="false"
-     height="16"
-     label="Email me IMs when I'm offline"
-     layout="topleft"
-     name="send_im_to_email"
-     top_pad="6"
-     width="330" />
+        enabled="false"
+        height="16"
+        label="Email me IMs when I'm offline"
+        layout="topleft"
+        name="send_im_to_email"
+        top_pad="6"
+        width="330" />
     <check_box
-    height="16"
-    label="Keep a conversation log and transcripts"
-    layout="topleft"
-    name="keep_convo_log_and_transcripts"
-    top_pad="6"
-    width="330" />
+        height="16"
+        label="Keep a conversation log and transcripts"
+        layout="topleft"
+        name="keep_convo_log_and_transcripts"
+        top_pad="6"
+        width="330" />
     <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble Chat"
-     layout="topleft"
-     top_pad="6"
-     name="bubble_text_chat"
-     width="330" />
+        control_name="UseChatBubbles"
+        follows="left|top"
+        height="16"
+        label="Bubble Chat"
+        layout="topleft"
+        top_pad="6"
+        name="bubble_text_chat"
+        width="330" />
     <text
-     follows="left|top"
-     layout="topleft"
-     left="345"
-     height="12"
-     name="font_size"
-     width="120"
-     top="0">
+        follows="left|top"
+        layout="topleft"
+        left="345"
+        height="12"
+        name="font_size"
+        width="120"
+        top="0">
       Font size:
     </text>
     <radio_group
-       height="90"
-       layout="topleft"
-       left="352"
-     control_name="ChatFontSize"
-       name="chat_font_size"
-       top_pad="0"
-       width="50">
+        height="90"
+        layout="topleft"
+        left="352"
+        control_name="ChatFontSize"
+        name="chat_font_size"
+        top_pad="0"
+        width="50">
       <radio_item
-       height="16"
-       label="Small"
-       layout="topleft"
-       name="radio"
-       value="0"
-       top="10"
-       width="125" />
+          height="16"
+          label="Small"
+          layout="topleft"
+          name="radio"
+          value="0"
+          top="10"
+          width="125" />
       <radio_item
-       height="16"
-       label="Medium"
-       layout="topleft"
-       name="radio2"
-       value="1"
-       top_pad="6"
-       width="125" />
+          height="16"
+          label="Medium"
+          layout="topleft"
+          name="radio2"
+          value="1"
+          top_pad="6"
+          width="125" />
       <radio_item
-       height="16"
-       label="Large"
-       layout="topleft"
-       name="radio3"
-       value="2"
-       top_pad="6"
-       width="125" />
+          height="16"
+          label="Large"
+          layout="topleft"
+          name="radio3"
+          value="2"
+          top_pad="6"
+          width="125" />
     </radio_group>    
     
   </panel>  
 
   <panel
-  border="false"
-  follows="left|top"
-  height="193"
-  layout="topleft"
-  left="13"
-  width="517">
+      border="false"
+      follows="left|top"
+      height="193"
+      layout="topleft"
+      left="13"
+      width="517">
 
     <text
-     follows="left|top"
-     layout="topleft"
-     height="12"
-     name="notifications"
-     left="0"
-     width="120">
+        follows="left|top"
+        layout="topleft"
+        height="12"
+        name="notifications"
+        left="0"
+        width="120">
       Notifications:
     </text>
     <text
-     follows="left|top"
-     layout="topleft"
-     height="12"
-     name="friend_ims"
-     width="145"
-     left="0"
-     top_pad="15"
-     >
+        follows="left|top"
+        layout="topleft"
+        height="12"
+        name="friend_ims"
+        width="145"
+        left="0"
+        top_pad="15">
       Friend IMs:
     </text>
     <combo_box
-             control_name="NotificationFriendIMOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="FriendIMOptions"
-             width="223">
+        control_name="NotificationFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="FriendIMOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
         follows="left|top"
@@ -154,244 +153,239 @@
         name="non_friend_ims"
         width="145"
         left="0"
-     top_pad="15"
-     >
+        top_pad="15">
       Non-friend IMs:
     </text>
     <combo_box
-             control_name="NotificationNonFriendIMOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="NonFriendIMOptions"
-             width="223">
+        control_name="NotificationNonFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NonFriendIMOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-          follows="left|top"
-          layout="topleft"
-          left="0"
-          height="13"
-          name="conference_ims"
-          width="145"
-          top_pad="14"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="13"
+        name="conference_ims"
+        width="145"
+        top_pad="14">
       Conference IMs:
     </text>
     <combo_box
-             control_name="NotificationConferenceIMOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="ConferenceIMOptions"
-             width="223">
+        control_name="NotificationConferenceIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="ConferenceIMOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-          follows="left|top"
-          layout="topleft"
-          left="0"
-          height="13"
-          name="group_chat"
-          width="145"
-          top_pad="14"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="13"
+        name="group_chat"
+        width="145"
+        top_pad="14">
       Group chat:
     </text>
     <combo_box
-             control_name="NotificationGroupChatOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="GroupChatOptions"
-             width="223">
+        control_name="NotificationGroupChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="GroupChatOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-            follows="left|top"
-            layout="topleft"
-            left="0"
-            height="12"
-            name="nearby_chat"
-            width="145"
-            top_pad="14"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="12"
+        name="nearby_chat"
+        width="145"
+        top_pad="14">
       Nearby chat:
     </text>
     <combo_box
-             control_name="NotificationNearbyChatOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="NearbyChatOptions"
-             width="223">
+        control_name="NotificationNearbyChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NearbyChatOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-            follows="left|top"
-            layout="topleft"
-            left="0"
-            height="12"
-            name="notifications_alert"
-            width="350"
-            top_pad="11"
-            visible="true"
-            text_color="DrYellow"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="12"
+        name="notifications_alert"
+        width="350"
+        top_pad="11"
+        visible="true"
+        text_color="DrYellow">
       To temporarily stop all notifications, use Me > Status > Busy.
     </text>
 
   </panel>
 
   <panel
-  border="false"
-  follows="left|top"
-  height="1"
-  layout="topleft"
-  left="13"
-  width="517">
-
-    <text
+      border="false"
       follows="left|top"
+      height="1"
       layout="topleft"
-      left="0"
-      name="play_sound"
-      width="100"
-      top_pad="13"
-      visible="true">
+      left="13"
+      width="517">
+
+    <text
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="play_sound"
+        width="100"
+        top_pad="13"
+        visible="true">
       Play sound:
     </text>
     <check_box
-         control_name="NewConversation"
-         height="16"
-         initial_value="true"
-         label="New conversation"
-         layout="topleft"
-         left_pad="15"
-         top_pad="-10"
-         name="new_conversation"
-         width="150" />
+        control_name="NewConversation"
+        height="16"
+        initial_value="true"
+        label="New conversation"
+        layout="topleft"
+        left_pad="15"
+        top_pad="-10"
+        name="new_conversation"
+        width="150" />
     <check_box
-         control_name="IncomingVoiceCall"
-         height="16"
-         initial_value="true"
-         label="Incoming voice call"
-         layout="topleft"
-         top_pad="6"
-         name="incoming_voice_call"
-         width="150" />
+        control_name="IncomingVoiceCall"
+        height="16"
+        initial_value="true"
+        label="Incoming voice call"
+        layout="topleft"
+        top_pad="6"
+        name="incoming_voice_call"
+        width="150" />
     <check_box
-         control_name="GroupChatMessages"
-         height="16"
-         initial_value="false"
-         label="Group chat messages"
-         layout="topleft"
-         top_pad="6"
-         name="group_chat_messages"
-         width="150" />
+        control_name="GroupChatMessages"
+        height="16"
+        initial_value="false"
+        label="Group chat messages"
+        layout="topleft"
+        top_pad="6"
+        name="group_chat_messages"
+        width="150" />
     <check_box
-         control_name="TeleportOffer"
-         height="16"
-         initial_value="true"
-         label="Teleport offer"
-         layout="topleft"
-         left_pad="35"
-         top_pad="-59"
-         name="teleport_offer"
-         width="150" />
+        control_name="TeleportOffer"
+        height="16"
+        initial_value="true"
+        label="Teleport offer"
+        layout="topleft"
+        left_pad="35"
+        top_pad="-59"
+        name="teleport_offer"
+        width="150" />
     <check_box
-         control_name="InventoryOffer"
-         height="16"
-         initial_value="false"
-         label="Inventory offer"
-         layout="topleft"
-         top_pad="6"
-         name="inventory_offer"
-         width="150" />
+        control_name="InventoryOffer"
+        height="16"
+        initial_value="false"
+        label="Inventory offer"
+        layout="topleft"
+        top_pad="6"
+        name="inventory_offer"
+        width="150" />
 
   </panel>
-    
+  
   <button
-   follows="left|top"
-   height="23"
-   label="Translation..."
-   layout="topleft"
-   left="9"
-   name="ok_btn"
-   top="-29"
-   width="170">
-   <button.commit_callback
-    function="Pref.TranslationSettings" />
+      follows="left|top"
+      height="23"
+      label="Translation..."
+      layout="topleft"
+      left="9"
+      name="ok_btn"
+      top="-29"
+      width="170">
+    <button.commit_callback
+        function="Pref.TranslationSettings" />
   </button>
   <button
-   follows="top|left"
-   height="23"
-   layout="topleft"
-   top_pad="-23"
-   left_pad="5"
-   name="autoreplace_showgui"
-   commit_callback.function="Pref.AutoReplace"
-   label="Auto-Replace..."
-   width="150">
+      follows="top|left"
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="autoreplace_showgui"
+      commit_callback.function="Pref.AutoReplace"
+      label="Auto-Replace..."
+      width="150">
   </button>
   <button
-   follows="top|left"
-   height="23"
-   layout="topleft"
-   top_pad="-23"
-   left_pad="5"
-   name="spellcheck_showgui"
-   commit_callback.function="Pref.SpellChecker"
-   label="Spell Checking..."
-   width="150">
+      follows="top|left"
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="spellcheck_showgui"
+      commit_callback.function="Pref.SpellChecker"
+      label="Spell Checking..."
+      width="150">
   </button>
 
 </panel>
-- 
cgit v1.2.3


From 908f8735d4d60266504c97c13d65fda74045b731 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 16:09:06 -0800
Subject: CHUI-517: Updating the copy in Preferences for Do Not Disturb mode.

---
 .../newview/skins/default/xui/en/panel_preferences_chat.xml  | 12 ++++++------
 .../skins/default/xui/en/panel_preferences_general.xml       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 5524d0e4f0..4964df53bb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -101,7 +101,7 @@
   <panel
       border="false"
       follows="left|top"
-      height="193"
+      height="198"
       layout="topleft"
       left="13"
       width="517">
@@ -274,13 +274,13 @@
         follows="left|top"
         layout="topleft"
         left="0"
-        height="12"
+        height="13"
         name="notifications_alert"
-        width="350"
+        width="500"
         top_pad="11"
         visible="true"
         text_color="DrYellow">
-      To temporarily stop all notifications, use Me > Status > Busy.
+      To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
     </text>
 
   </panel>
@@ -288,7 +288,7 @@
   <panel
       border="false"
       follows="left|top"
-      height="1"
+      height="67"
       layout="topleft"
       left="13"
       width="517">
@@ -299,7 +299,7 @@
         left="0"
         name="play_sound"
         width="100"
-        top_pad="13"
+        top_pad="8"
         visible="true">
       Play sound:
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 2cb063e8ee..ea0f7d8593 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -409,7 +409,7 @@
      name="text_box3"
      top_pad="3"
      width="240">
-       Busy mode response:
+       Do Not Disturb response:
     </text>
     <text_editor
      control_name="DoNotDisturbModeResponse"
-- 
cgit v1.2.3


From 1786a7150e754ea10dfd5172ec2491dd67e83a9a Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 16:16:06 -0800
Subject: CHUI-517: Updating the copy for the avatar in-world name bubble
 status for Do Not Disturb mode.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 79ee83969b..8310e0c62d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -295,7 +295,7 @@ Please try logging in again in a minute.</string>
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
-	<string name="AvatarDoNotDisturb">Busy</string>
+	<string name="AvatarDoNotDisturb">Do Not Disturb</string>
 	<string name="AvatarMuted">Blocked</string>
 
 	<!-- animations -->
-- 
cgit v1.2.3


From f429decb0c222b293cee4d3b27c8340262fab572 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 9 Nov 2012 17:00:43 -0800
Subject: CHUI-486: Now the new chat preferences in drop down lists and
 checkboxes are storable. These values are accessible globally using
 gSavedSettings.

---
 .../default/xui/en/panel_preferences_chat.xml      | 46 ++++++++++------------
 1 file changed, 21 insertions(+), 25 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 4964df53bb..f1b11e2ca8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -37,6 +37,7 @@
         top_pad="6"
         width="330" />
     <check_box
+        control_name="KeepConversationLogTranscripts"
         height="16"
         label="Keep a conversation log and transcripts"
         layout="topleft"
@@ -135,15 +136,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -166,15 +167,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -197,15 +198,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -228,15 +229,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -259,15 +260,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolBarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -304,9 +305,8 @@
       Play sound:
     </text>
     <check_box
-        control_name="NewConversation"
+        control_name="PlaySoundNewConversation"
         height="16"
-        initial_value="true"
         label="New conversation"
         layout="topleft"
         left_pad="15"
@@ -314,27 +314,24 @@
         name="new_conversation"
         width="150" />
     <check_box
-        control_name="IncomingVoiceCall"
+        control_name="PlaySoundIncomingVoiceCall"
         height="16"
-        initial_value="true"
         label="Incoming voice call"
         layout="topleft"
         top_pad="6"
         name="incoming_voice_call"
         width="150" />
     <check_box
-        control_name="GroupChatMessages"
+        control_name="PlaySoundGroupChatMessages"
         height="16"
-        initial_value="false"
         label="Group chat messages"
         layout="topleft"
         top_pad="6"
         name="group_chat_messages"
         width="150" />
     <check_box
-        control_name="TeleportOffer"
+        control_name="PlaySoundTeleportOffer"
         height="16"
-        initial_value="true"
         label="Teleport offer"
         layout="topleft"
         left_pad="35"
@@ -342,9 +339,8 @@
         name="teleport_offer"
         width="150" />
     <check_box
-        control_name="InventoryOffer"
+        control_name="PlaySoundInventoryOffer"
         height="16"
-        initial_value="false"
         label="Inventory offer"
         layout="topleft"
         top_pad="6"
-- 
cgit v1.2.3


From ab5a0a1d4d0a029dd92c9fc108638736a57ce7c6 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 12 Nov 2012 15:06:42 +0200
Subject: CHUI-362 FIXED (Torn off conversation name is highlighted when
 selected in conversation list with different conversation showing in message
 panel): connect new method "returnFloaterToHost" to click on quasi-URL "Bring
 it back"

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e3db3d52ed..1388b9e474 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -159,9 +159,9 @@
                    top="40"
                    height="20"
                    valign="center"
-                   parse_urls="false"
+                   parse_urls="true"
                    wrap="true">
-                     Bring it back.
+                     [secondlife:/// Bring it back.]
                 </text>
              </panel>
             </panel_container>
-- 
cgit v1.2.3


From b8e036dff57dd83fbe2069453544050339ff102d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 13 Nov 2012 12:15:36 -0500
Subject: STORM-1918 Part of the group notice attachment box does not allow
 dropping of assets.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 6d5fb51e85..c8ce5cdebf 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -202,14 +202,14 @@ Maximum 200 per group daily
             Drag and drop item here to attach it:
         </text>
         <icon
-         height="72"
+         height="48"
          image_name="DropTarget"
          layout="topleft"
          left_pad="10"
          mouse_opaque="true"
          name="drop_icon"
          top_delta="-10"
-         width="72" />
+         width="110" />
         <button
          follows="left|top"
          layout="topleft"
-- 
cgit v1.2.3


From 5a31b5dceaeb7dd7089c7426371aac39927c5c02 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 13 Nov 2012 11:19:45 -0800
Subject: CHUI-486: Code cleanup, instead of using values such as 0, 1, 2 now
 using strings 'toast', 'flash', 'none'. These values are used whether to show
 a notification or not.

---
 .../default/xui/en/panel_preferences_chat.xml      | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index f1b11e2ca8..8ab5c9a99c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -137,15 +137,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -168,15 +168,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -199,15 +199,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -230,15 +230,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -261,15 +261,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolBarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
-- 
cgit v1.2.3


From 7a088e9b2c8ffddbf5cd8dad72281a64a32d7c63 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 14 Nov 2012 19:39:50 +0200
Subject: CHUI-501 FIXED Add link to Privacy tab from Comms floater

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 6fa0707eea..523ce7b35b 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -68,6 +68,13 @@
          function="IMFloaterContainer.Action"
          parameter="chat_preferences" />
       </menu_item_call>
+    <menu_item_call
+         label="Privacy preferences..."
+         name="privacy_preferences">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="privacy_preferences" />
+    </menu_item_call>
     <menu_item_check
          label="Open conversation log"
          name="Conversation"
-- 
cgit v1.2.3


From 4ea44918dd040520bdd8eb1e52f2b6ba6cfa6f8b Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 16 Nov 2012 19:36:46 +0200
Subject: CHUI-525 FIXED Tootlips are added for Info buttons

---
 indra/newview/skins/default/xui/en/panel_avatar_list_item.xml | 1 +
 indra/newview/skins/default/xui/en/panel_group_list_item.xml  | 1 +
 2 files changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index b7c58eb6ab..aa1b929412 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -129,6 +129,7 @@
      left_pad="3"
      right="-53"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="0"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 12735026fa..cfe3aeb7c9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -56,6 +56,7 @@
      left_pad="3"
      right="-31"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="-2"
      width="16" />
-- 
cgit v1.2.3


From d3474c6eaf5f26986e7988f4ca773f67e034c49d Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 15 Nov 2012 15:42:22 -0800
Subject: CHUI-489: Now sounds exist for teleport and inventory offers. The
 sound is specified in notifications.xml. Also changes for CHUI 486, which
 allow the user to set preferences for hearing sounds for a New Conversation,
 Incoming Voice Call, Teleport Offer and Inventory Offer.

---
 indra/newview/skins/default/xui/en/notifications.xml          | 6 ++++--
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6c2ad869ac..bf2bfaf386 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6460,7 +6460,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="UserGiveItem"
    log_to_im ="true"
-   type="offer">
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
@@ -6517,7 +6518,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    name="TeleportOffered"
    log_to_im="true"
    log_to_chat="false"
-   type="offer">
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has offered to teleport you to their location:
 
 “[MESSAGE]”
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 8ab5c9a99c..712e8bff7f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -322,6 +322,7 @@
         name="incoming_voice_call"
         width="150" />
     <check_box
+        enabled="false"
         control_name="PlaySoundGroupChatMessages"
         height="16"
         label="Group chat messages"
-- 
cgit v1.2.3


From ad6959619f154bbe984d33aa7e6c60333cbb4438 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Thu, 15 Nov 2012 18:25:34 -0600
Subject: Initial texture panel rework: moved controls, new labels, eliminated
 flip checkboxes and apply button, added selection dropdowns.

---
 .../newview/skins/default/xui/en/floater_tools.xml | 538 +--------------------
 .../skins/default/xui/en/panel_tools_texture.xml   | 483 ++++++++++++++++++
 2 files changed, 490 insertions(+), 531 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_tools_texture.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5204efbf65..3b501e1ece 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="590"
+ height="615"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -830,7 +830,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="410"
+     height="435"
      halign="center"
      left="0"
      name="Object Info Tabs"
@@ -1353,7 +1353,7 @@ even though the user gets a free copy.
       <panel
          border="false"
          follows="all"
-         height="567"
+         height="592"
          label="Object"
          layout="topleft"
          left_delta="0"
@@ -2110,7 +2110,7 @@ even though the user gets a free copy.
         <panel
          border="false"
          follows="all"
-         height="367"
+         height="392"
          label="Features"
          layout="topleft"
          left_delta="0"
@@ -2491,534 +2491,10 @@ even though the user gets a free copy.
              width="132" />
         </panel>
          <panel
-         border="false"
-         follows="all"
-         height="367"
          label="Texture"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
          help_topic="toolbox_texture_tab"
          name="Texture"
-         top_delta="0"
-         width="295">
-            <panel.string
-             name="string repeats per meter">
-                Repeats Per Meter
-            </panel.string>
-            <panel.string
-             name="string repeats per face">
-                Repeats Per Face
-            </panel.string>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="locked_image.j2c"
-             follows="left|top"
-             height="80"
-             label="Texture"
-             layout="topleft"
-             left="10"
-             name="texture control"
-             tool_tip="Click to choose a picture"
-             top="8"
-             width="64" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="80"
-             label="Color"
-             layout="topleft"
-             left_pad="15"
-             name="colorswatch"
-             tool_tip="Click to open color picker"
-             top_delta="0"
-             width="64" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="15"
-             name="color trans"
-             text_readonly_color="LabelDisabledColor"
-             top="6"
-             width="110">
-                Transparency %
-            </text>
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="2"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_val="100"
-             name="ColorTrans"
-             top_pad="4"
-             width="80" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="glow label"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="8"
-             width="80">
-                Glow
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             name="glow"
-             top_pad="4"
-             width="80" />
-            <check_box
-             height="19"
-             label="Full Bright"
-             layout="topleft"
-             left_delta="-5"
-             name="checkbox fullbright"
-             top_pad="4"
-             width="81" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex gen"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="5"
-             width="90">
-                Mapping
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox texgen"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="Default"
-                 name="Default"
-                 value="Default" />
-                <combo_box.item
-                 label="Planar"
-                 name="Planar"
-                 value="Planar" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label shininess"
-             left_pad="4"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Shininess
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox shininess"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Low"
-                 name="Low"
-                 value="Low" />
-                <combo_box.item
-                 label="Medium"
-                 name="Medium"
-                 value="Medium" />
-                <combo_box.item
-                 label="High"
-                 name="High"
-                 value="High" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="4"
-             name="label bumpiness"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Bumpiness
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox bumpiness"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Brightness"
-                 name="Brightness"
-                 value="Brightness" />
-                <combo_box.item
-                 label="Darkness"
-                 name="Darkness"
-                 value="Darkness" />
-                <combo_box.item
-                 label="woodgrain"
-                 name="woodgrain"
-                 value="woodgrain" />
-                <combo_box.item
-                 label="bark"
-                 name="bark"
-                 value="bark" />
-                <combo_box.item
-                 label="bricks"
-                 name="bricks"
-                 value="bricks" />
-                <combo_box.item
-                 label="checker"
-                 name="checker"
-                 value="checker" />
-                <combo_box.item
-                 label="concrete"
-                 name="concrete"
-                 value="concrete" />
-                <combo_box.item
-                 label="crustytile"
-                 name="crustytile"
-                 value="crustytile" />
-                <combo_box.item
-                 label="cutstone"
-                 name="cutstone"
-                 value="cutstone" />
-                <combo_box.item
-                 label="discs"
-                 name="discs"
-                 value="discs" />
-                <combo_box.item
-                 label="gravel"
-                 name="gravel"
-                 value="gravel" />
-                <combo_box.item
-                 label="petridish"
-                 name="petridish"
-                 value="petridish" />
-                <combo_box.item
-                 label="siding"
-                 name="siding"
-                 value="siding" />
-                <combo_box.item
-                 label="stonetile"
-                 name="stonetile"
-                 value="stonetile" />
-                <combo_box.item
-                 label="stucco"
-                 name="stucco"
-                 value="stucco" />
-                <combo_box.item
-                 label="suction"
-                 name="suction"
-                 value="suction" />
-                <combo_box.item
-                 label="weave"
-                 name="weave"
-                 value="weave" />
-            </combo_box>
-          <!--
-            <line_editor
-             bevel_style="in"
-             border_style="line"
-             border_thickness="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             max_length_bytes="63"
-             name="Home Url"
-             select_on_focus="true"
-             top="134"
-             width="250" />
-            <check_box
-             height="16"
-             label="Media Face"
-             layout="topleft"
-             left_delta="0"
-             name="has media"
-             top_pad="6"
-             width="70" />
-            <button
-             follows="left|top"
-             font="SansSerifSmall"
-             height="20"
-             label="Set Media Info"
-             label_selected="Set Media Info"
-             layout="topleft"
-             left_pad="60"
-             name="media info set"
-             top_delta="-4"
-             width="120" />
--->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             left="17"
-             name="checkbox planar align"
-             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="26"
-             width="140" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="rpt"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="2"
-             width="140">
-                Repeats / Face
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleU"
-             top_pad="5"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip s"
-             top_delta="0"
-             width="70" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleV"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip t"
-             top_delta="0"
-             width="70" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-			 label="Rotation˚"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="9999"
-             min_val="-9999"
-             name="TexRot"
-             width="195" />
-
-            <spinner
-             decimal_digits="1"
-             follows="left|top"
-             height="23"
-             initial_value="1"
-			 label="Repeats / Meter"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="10"
-             min_val="0.1"
-             name="rptctrl"
-             width="195" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Apply"
-             label_selected="Apply"
-             layout="topleft"
-             left_pad="5"
-             name="button apply"
-             width="75" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex offset"
-             text_readonly_color="LabelDisabledColor"
-             width="200">
-                Texture Offset
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             min_val="-1"
-             name="TexOffsetU"
-             width="185" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="TexOffsetV"
-             top_pad="1"
-             width="185" />
-        <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="Add_Media"
-         left="0"
-         height="47"
-         width="290">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="18"
-             layout="topleft"
-             left="10"
-             top_pad="3"
-             name="media_tex"
-             width="190">
-              Media
-			</text>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="AddItem_Press"
-			 image_unselected="AddItem_Off"
-			 image_disabled="AddItem_Disabled"
-			 layout="topleft"
-			 left_pad="0"
-			 name="add_media"
-			 tab_stop="false"
-			 top_delta="0"
-			 tool_tip="Add Media"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.AddMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="TrashItem_Press"
-			 image_unselected="TrashItem_Off"
-			 layout="topleft"
-			 left_pad="5"
-			 name="delete_media"
-			 tool_tip="Delete this media texture"
-			 top_delta="0"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.DeleteMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 tool_tip="Edit this Media"
-			 height="12"
-             image_disabled="Icon_Gear_Background"
-             image_selected="Icon_Gear_Press"
-             image_unselected="Icon_Gear_Foreground"
-			 layout="topleft"
-			 left_pad="10"
-			 name="edit_media"
-			 top_delta="3"
-			 width="12">
-				<button.commit_callback
-				function="BuildTool.EditMedia"/>
-			</button>
-      <text
-			 follows="left|top|right"
-			 height="9"
-			 layout="topleft"
-			 left="10"
-                         use_ellipses="true"
-			 read_only="true"
-			 name="media_info"
-			 width="280" />
-      <web_browser
-        visible="false"
-        enabled="false"
-        border_visible="true"
-        bottom_delta="0"
-        follows="top|left"
-        left="0"
-        name="title_media"
-        width="4"
-        height="4"
-        start_url="about:blank"
-        decouple_texture_size="true" />
-     <button
-			 follows="right|top"
-			 height="22"
-			 label="Align"
-			 label_selected="Align Media"
-			 layout="topleft"
-			 right="-16"
-			 name="button align"
-			 top_delta="-4"
-			 tool_tip="Align media texture (must load first)"
-			 width="80" />
-		</panel>
+         filename="panel_tools_texture.xml">
 	   </panel>
        <panel
          border="false"
@@ -3054,7 +2530,7 @@ even though the user gets a free copy.
              border_visible="true"
              bevel_style="in"
              follows="left|top|right"
-             height="325"
+             height="350"
              layout="topleft"
              left="10"
              name="contents_inventory"
@@ -3064,7 +2540,7 @@ even though the user gets a free copy.
         </tab_container>
 	<panel
 	 follows="left|top"
-     height="384"
+     height="409"
      layout="topleft"
      left_delta="0"
      name="land info panel"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
new file mode 100644
index 0000000000..26b2d83351
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         border="false"
+         follows="all"
+         height="400"
+         label="Texture"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         help_topic="toolbox_texture_tab"
+         name="Texture"
+         top="0"
+         width="295">
+            <panel.string
+             name="string repeats per meter">
+                Repeats Per Meter
+            </panel.string>
+            <panel.string
+             name="string repeats per face">
+                Repeats Per Face
+            </panel.string>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             name="color label"
+             text_readonly_color="LabelDisabledColor"
+             top="6"
+             width="64">
+                Color
+            </text>
+            <!-- label is blank because control places it below the box -->
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="45"
+             label=""
+             layout="topleft"
+             left="10"
+             name="colorswatch"
+             tool_tip="Click to open color picker"
+             top="20"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="15"
+             name="color trans"
+             text_readonly_color="LabelDisabledColor"
+             top="6"
+             width="110">
+                Transparency %
+            </text>
+            <spinner
+             decimal_digits="0"
+             follows="left|top"
+             height="19"
+             increment="2"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="ColorTrans"
+             top_pad="4"
+             width="80" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="15"
+             name="glow label"
+             text_readonly_color="LabelDisabledColor"
+             top="6"
+             width="80">
+                Glow
+            </text>
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             name="glow"
+             top_pad="4"
+             width="80" />
+            <check_box
+             height="19"
+             label="Full Bright"
+             layout="topleft"
+             left="7"
+             name="checkbox fullbright"
+             top_pad="4"
+             width="81" />
+            <combo_box
+             height="23"
+             layout="topleft"
+             left="10"
+             name="combobox matmedia"
+             top_pad="5"
+             width="100">
+                <combo_box.item
+                 label="Materials"
+                 name="Materials"
+                 value="Materials" />
+                <combo_box.item
+                 label="Media"
+                 name="Media"
+                 value="Media" />
+            </combo_box>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             name="combobox mattype"
+             top_delta="0"
+             width="155">
+                <combo_box.item
+                 label="Texture (diffuse)"
+                 name="Texture (diffuse)"
+                 value="Texture (diffuse)" />
+                <combo_box.item
+                 label="Bumpiness (normal)"
+                 name="Bumpiness (normal)"
+                 value="Bumpiness (normal)" />
+                <combo_box.item
+                 label="Shininess (specular)"
+                 name="Shininess (specular)"
+                 value="Shininess (specular)" />
+            </combo_box>
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="locked_image.j2c"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="texture control"
+             tool_tip="Click to choose a picture"
+             top_pad="8"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label shininess"
+             left_pad="10"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="6"
+             width="90">
+                Shininess
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             name="combobox shininess"
+             top_delta="-6"
+             width="90">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Low"
+                 name="Low"
+                 value="Low" />
+                <combo_box.item
+                 label="Medium"
+                 name="Medium"
+                 value="Medium" />
+                <combo_box.item
+                 label="High"
+                 name="High"
+                 value="High" />
+            </combo_box>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-100"
+             name="label bumpiness"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="0"
+             width="90">
+                Bumpiness
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_delta="0"
+             name="combobox bumpiness"
+             top_pad="4"
+             width="90">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Brightness"
+                 name="Brightness"
+                 value="Brightness" />
+                <combo_box.item
+                 label="Darkness"
+                 name="Darkness"
+                 value="Darkness" />
+                <combo_box.item
+                 label="woodgrain"
+                 name="woodgrain"
+                 value="woodgrain" />
+                <combo_box.item
+                 label="bark"
+                 name="bark"
+                 value="bark" />
+                <combo_box.item
+                 label="bricks"
+                 name="bricks"
+                 value="bricks" />
+                <combo_box.item
+                 label="checker"
+                 name="checker"
+                 value="checker" />
+                <combo_box.item
+                 label="concrete"
+                 name="concrete"
+                 value="concrete" />
+                <combo_box.item
+                 label="crustytile"
+                 name="crustytile"
+                 value="crustytile" />
+                <combo_box.item
+                 label="cutstone"
+                 name="cutstone"
+                 value="cutstone" />
+                <combo_box.item
+                 label="discs"
+                 name="discs"
+                 value="discs" />
+                <combo_box.item
+                 label="gravel"
+                 name="gravel"
+                 value="gravel" />
+                <combo_box.item
+                 label="petridish"
+                 name="petridish"
+                 value="petridish" />
+                <combo_box.item
+                 label="siding"
+                 name="siding"
+                 value="siding" />
+                <combo_box.item
+                 label="stonetile"
+                 name="stonetile"
+                 value="stonetile" />
+                <combo_box.item
+                 label="stucco"
+                 name="stucco"
+                 value="stucco" />
+                <combo_box.item
+                 label="suction"
+                 name="suction"
+                 value="suction" />
+                <combo_box.item
+                 label="weave"
+                 name="weave"
+                 value="weave" />
+            </combo_box>
+            <text
+			 follows="left|top|right"
+			 height="9"
+			 layout="topleft"
+			 left="10"
+			 top_delta="-8"
+             use_ellipses="true"
+			 read_only="true"
+			 name="media_info"
+			 width="280">
+			 URL of chosen media, if any, goes here
+			 </text>
+			<button
+			 follows="top|left"
+			 height="18"
+			 layout="topleft"
+			 left="10"
+			 name="add_media"
+			 top_pad="4"
+			 tool_tip="Add Media"
+			 label="Choose..."
+			 width="85">
+				<button.commit_callback
+				function="BuildTool.AddMedia"/>
+			</button>
+			<button
+			 follows="top|left"
+			 height="18"
+			 layout="topleft"
+			 left_pad="5"
+			 name="delete_media"
+			 tool_tip="Delete this media texture"
+			 top_delta="0"
+			 label="Remove"
+			 width="85">
+				<button.commit_callback
+				function="BuildTool.DeleteMedia"/>
+			</button>
+            <button
+			 follows="left|top"
+			 height="18"
+			 label="Align"
+			 label_selected="Align Media"
+			 layout="topleft"
+			 left_pad="5"
+			 name="button align"
+			 top_delta="0"
+			 tool_tip="Align media texture (must load first)"
+			 width="85" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             name="tex gen"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="60"
+             width="140">
+                Mapping
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="0"
+             name="combobox texgen"
+             top_pad="-13"
+             width="125">
+                <combo_box.item
+                 label="Default"
+                 name="Default"
+                 value="Default" />
+                <combo_box.item
+                 label="Planar"
+                 name="Planar"
+                 value="Planar" />
+            </combo_box>
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="TexScaleU"
+             top_pad="5"
+             width="265" />
+            <!-- <check_box
+             height="19"
+             label="Flip"
+             layout="topleft"
+             left_pad="5"
+             name="checkbox flip s"
+             top_delta="0"
+             width="70" /> -->
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="TexScaleV"
+             width="265" />
+            <!-- <check_box
+             height="19"
+             label="Flip"
+             layout="topleft"
+             left_pad="5"
+             name="checkbox flip t"
+             top_delta="0"
+             width="70" /> -->
+            <spinner
+             decimal_digits="1"
+             follows="left|top"
+             height="19"
+             initial_value=""
+			 label="Repeats per meter"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="10"
+             min_val="0.1"
+             name="rptctrl"
+             width="265" />
+            <!-- <button
+             follows="left|top"
+             height="19"
+             label="Apply"
+             label_selected="Apply"
+             layout="topleft"
+             left_pad="5"
+             name="button apply"
+             width="75" /> -->
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+			 label="Rotation degrees"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="9999"
+             min_val="-9999"
+             name="TexRot"
+             width="265" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="TexOffsetU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="TexOffsetV"
+             width="265" />
+            <check_box
+             follows="top|left"
+             height="16"
+             initial_value="false"
+             label="Align planar faces"
+             layout="topleft"
+             left="7"
+             name="checkbox planar align"
+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
+             top_delta="26"
+             width="260" />
+            <web_browser
+             visible="false"
+             enabled="false"
+             border_visible="true"
+             bottom_delta="0"
+             follows="top|left"
+             left="0"
+             name="title_media"
+             width="4"
+             height="4"
+             start_url="about:blank"
+             decouple_texture_size="true" />
+	   </panel>
-- 
cgit v1.2.3


From 568d818ffe214c358f92717ceb86dd20cb4aed26 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 15 Nov 2012 19:08:08 -0800
Subject: CHUI-518: WIP First pass as implementing auto-reject voice calls in
 do not disturb mode.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6c2ad869ac..eaa020ff49 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3695,6 +3695,7 @@ Do Not Disturb is on.  You will not be notified of incoming communications.
 
 - Other residents will receive your Do Not Disturb response (set in Preferences &gt; General).
 - Teleportation offers will be declined.
+- Voice calls will be rejected.
 - Inventory offers will go to your Trash.
     <usetemplate
      ignoretext="I change my status to Do Not Disturb mode"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8489e8ca0f..18b914c764 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3384,7 +3384,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="answered_call">Your call has been answered</string>
 	<string name="you_started_call">You started a voice call</string>
 	<string name="you_joined_call">You joined the voice call</string>
-	<string name="name_started_call">[NAME] started a voice call</string>
+  <string name="you_auto_rejected_call-im">You automatically rejected the voice call while &apos;Do Not Disturb&apos; was on.</string>
+  <string name="name_started_call">[NAME] started a voice call</string>
 
   <string name="ringing-im">
     Joining voice call...
-- 
cgit v1.2.3


From 7bddf05f89de5b4de094a545082c79d8ae4edb53 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Fri, 16 Nov 2012 15:49:30 -0800
Subject: sync with viewer-development

---
 indra/newview/skins/default/xui/de/strings.xml     |  2 +-
 indra/newview/skins/default/xui/en/panel_login.xml | 11 ++++++++++-
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 indra/newview/skins/default/xui/es/strings.xml     |  2 +-
 indra/newview/skins/default/xui/fr/strings.xml     |  2 +-
 indra/newview/skins/default/xui/it/strings.xml     |  2 +-
 indra/newview/skins/default/xui/ja/strings.xml     |  2 +-
 indra/newview/skins/default/xui/pt/strings.xml     |  2 +-
 indra/newview/skins/default/xui/ru/strings.xml     |  2 +-
 indra/newview/skins/default/xui/tr/strings.xml     |  2 +-
 indra/newview/skins/default/xui/zh/strings.xml     |  2 +-
 11 files changed, 20 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index aeed9f3796..79cb73ecf9 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=de-DE
+		http://join.secondlife.com/index.php?lang=de-DE&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 9c96143aa3..134ca75018 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -31,6 +31,7 @@
       width="996"/>
   <layout_stack
       animate="false"
+      clip="false"
       follows="left|bottom|right"
       name="login_widgets"
       layout="topleft"
@@ -68,12 +69,16 @@
           width="150">
         Username:
       </text>
+      <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+           with focus in this combo_box, we can use commit action to initiate
+           login -->
       <combo_box
           allow_text_entry="true"
           follows="left|bottom"
           height="22"
           left_delta="0"
           max_chars="128"
+          commit_on_focus_lost="false"
           combo_editor.prevalidate_callback="ascii"
           tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
           top_pad="0"
@@ -96,6 +101,9 @@
           width="150">
         Password:
       </text>
+      <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+           with focus in this line_editor, we can use commit action to
+           initiate login -->
       <line_editor
           follows="left|bottom"
           height="22"
@@ -103,6 +111,7 @@
           name="password_edit"
           is_password="true" 
           select_on_focus="true"
+          commit_on_focus_lost="false"
           top_pad="0"
           width="135" />
     </layout_panel>
@@ -223,7 +232,7 @@
         follows="right|bottom"
         name="links" 
         width="210"
-        min_width="210"
+        min_width="100"
         height="80">
       <text
           follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 15eb46c348..2157a05bbf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -59,7 +59,7 @@
 	<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
-	<string name="create_account_url">http://join.secondlife.com/</string>
+	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
 
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index dcde68a93a..52bcab54e5 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES
+		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 27f0e9464b..6a2a3f559a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=fr-FR
+		http://join.secondlife.com/index.php?lang=fr-FR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 2dc91d316a..fb1e387468 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=it-IT
+		http://join.secondlife.com/index.php?lang=it-IT&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index ee7c11c3e9..50697e5500 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ja-JP
+		http://join.secondlife.com/index.php?lang=ja-JP&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 9f611c08e4..bc72b86020 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=pt-BR
+		http://join.secondlife.com/index.php?lang=pt-BR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 6e8ec05e9f..f9ded799bf 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ru-RU
+		http://join.secondlife.com/index.php?lang=ru-RU&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index a35e1de721..1be8f5974c 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=tr-TR
+		http://join.secondlife.com/index.php?lang=tr-TR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 2ca99e50d4..3f17324006 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -137,7 +137,7 @@
 		結束退出
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		你目前所用的 Viewer 已經無法再進入第二人生。 請到這個頁面下載最新 Viewer：
-- 
cgit v1.2.3


From 2d9285cddb4a48fb766b21fac2705c8873e15f93 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 16 Nov 2012 18:53:05 -0800
Subject: CHUI-529: Now the conversations floater will appear when the chat
 preference is set for friend, non-friend, conference, group and nearby chat.

---
 .../skins/default/xui/en/panel_preferences_chat.xml  | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 712e8bff7f..0c94b6b223 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -134,6 +134,10 @@
         top_delta="-6"
         name="FriendIMOptions"
         width="223">
+      <combo_box.item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>      
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
@@ -165,6 +169,10 @@
         top_delta="-6"
         name="NonFriendIMOptions"
         width="223">
+      <combo_box.item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
@@ -196,6 +204,10 @@
         top_delta="-6"
         name="ConferenceIMOptions"
         width="223">
+      <combo_box.item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
@@ -227,6 +239,10 @@
         top_delta="-6"
         name="GroupChatOptions"
         width="223">
+      <combo_box.item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
@@ -258,6 +274,10 @@
         top_delta="-6"
         name="NearbyChatOptions"
         width="223">
+      <combo_box.item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-- 
cgit v1.2.3


From 48a683af70fe359f4b4b6fdf6486208fc34dc2a9 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 19 Nov 2012 17:40:46 +0200
Subject: CHUI-488 ADD. fIX Clean up code

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 0aa478ace9..55ae158c00 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,8 +30,8 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="99999"
-                        button_flash_rate="1.0"
+                        button_flash_count="3"
+                        button_flash_rate="0.25"
                         flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
-- 
cgit v1.2.3


From 2c2e8b83d02efcdec9ccd3216e64073b4e8e1d57 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 19 Nov 2012 19:26:00 +0200
Subject: CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not
 possible to collapse the right side of the conversation dialog: the toolbar
 is completely missing and the "<<" chevrons are not there): This was because
 the button "<<" belonged session's floater and not the container. Therefore,
 when all the floaters in the stack becomes invisible, their buttons also
 become invisible. Solution: Added additional button "<<" in the stub_panel of
 the container.

---
 .../skins/default/xui/en/floater_im_container.xml       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 1388b9e474..4aa7c88312 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -134,6 +134,19 @@
                left="0"
                height="430"
                width="412">
+                 <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_collapse"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 right="-10"
+                 name="stub_collapse_btn"
+                 tool_tip="Collapse this pane"
+                 width="31" />
                  <text
                    type="string"
                    clip_partial="false"
@@ -142,7 +155,7 @@
                    left="20"
                    right="-20"
                    name="stub_textbox_1"
-                   top="10"
+                   top="30"
                    height="20"
                    valign="center"
                    wrap="true">
@@ -156,7 +169,7 @@
                    left="20"
                    right="-20"
                    name="stub_textbox_2"
-                   top="40"
+                   top="60"
                    height="20"
                    valign="center"
                    parse_urls="true"
-- 
cgit v1.2.3


From 668761e1196517913688bab6763bd9d2e11359b0 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 20 Nov 2012 13:39:09 +0200
Subject: CHUI-539 FIXED Chat FUI button flashes indefinitely if Icons Only
 setting is selected for the button display

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 55ae158c00..053b213ef4 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -51,7 +51,7 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="99999"
-               button_flash_rate="1.0"
+               button_flash_count="3"
+               button_flash_rate="0.25"
                flash_color="EmphasisColor"/>
 </toolbar>
-- 
cgit v1.2.3


From 81478d6c4475f4650a23ad0e87496e3d425d5709 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 20 Nov 2012 18:57:29 +0200
Subject: CHUI-490 FIXED Small ui changes. Changed sound that is playing when
 floater is opened. Call startIM() when user clicks on "Open IM instead"
 button.

---
 .../skins/default/xui/en/floater_incoming_call.xml | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 81194f61cf..a7864381a9 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,8 +8,8 @@
  layout="topleft"
  name="incoming call"
  help_topic="incoming_call"
- title="Incoming call"
- width="410">
+ sound_flags="0"
+ width="550">
     <floater.string
      name="lifetime">
         5
@@ -24,7 +24,7 @@
     </floater.string>
     <floater.string
      name="VoiceInviteP2P">
-        is calling.
+        is calling you.
     </floater.string>
     <floater.string
      name="VoiceInviteAdHoc">
@@ -49,14 +49,14 @@
      image_name="icon_avatar_online.tga"
      layout="topleft"
      left_delta="19"
-     top="35"
+     top="20"
      width="36" />
     <group_icon
      enabled="false"
      follows="left|top"
      height="36"
      layout="topleft"
-     top="35"
+     top="20"
      width="36" />
     <text
      clip_partial="true"
@@ -67,43 +67,43 @@
      name="caller name"
      top="20"
      use_ellipses="true"
-     width="315"
+     width="475"
      word_wrap="true" />
-    <text
-     clip_partial="true"
-     font="SansSerif"
-     height="30"
-     layout="topleft"
-     left="77"
-     name="question"
-     top_pad="5"
-     use_ellipses="true"
-     width="315"
-     word_wrap="true">
-     Do you want to leave [CURRENT_CHAT] and join this voice chat?
-    </text>
-    <button
+     <button
      height="24"
-     label="Accept"
-     label_selected="Accept"
+     label="Answer"
+     label_selected="Answer"
      layout="topleft"
      left="70"
      name="Accept"
-     top="92"
-     width="100" />
+     top_pad="5"
+     width="120" />
     <button
      height="24"
-     label="Reject"
-     label_selected="Reject"
+     label="Ignore"
+     label_selected="Ignore"
      layout="topleft"
      name="Reject"
      left_pad="10"
-     width="100" />
+     width="120" />
     <button
      height="24"
-     label="Start IM"
+     label="Open IM instead"
      layout="topleft"
      name="Start IM"
      left_pad="10"
-     width="100" />
+     width="120" />
+    <text
+     clip_partial="true"
+     font="SansSerif"
+     height="30"
+     layout="topleft"
+     left="77"
+     name="question"
+     top_pad="5"
+     use_ellipses="true"
+     width="475"
+     word_wrap="true">
+     If you answer, you will be disconnected from your current voice conversation.
+    </text>
 </floater>
-- 
cgit v1.2.3


From 3361c9b911447cf30355d1491ce8dd8962676685 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 20 Nov 2012 19:47:56 +0200
Subject: CHUI-522 FIXED Implement check box item 'Keep a conversation log and
 transcript'

---
 indra/newview/skins/default/xui/en/menu_participant_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 523ce7b35b..33d7bd7c01 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -85,5 +85,8 @@
         <menu_item_check.on_click
          function="Floater.Toggle"
          parameter="conversation" />
-      </menu_item_check>
+        <menu_item_check.on_enable
+         function="Avatar.EnableItem"
+         parameter="conversation_log" />
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 8f7eee13495bf2a72d0b1a5b81ff2a2e7e556659 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 21 Nov 2012 11:42:51 -0800
Subject: sync with viewer-development

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 63e154697b..2c420aa1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -57,7 +57,7 @@
    layout="topleft"
    name="take_copy">
     <menu_item_call.on_click
-     function="InspectObject.TakeFreeCopy"/>
+     function="Tools.TakeCopy"/>
     <menu_item_call.on_visible
       function="Tools.EnableTakeCopy"/>
   </menu_item_call>
-- 
cgit v1.2.3


From a12464b9cbc40d4584d6968db2092a56fa3f4bc6 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 21 Nov 2012 11:46:38 -0800
Subject: CHUI-429, CHUI-511, CHUI-388 : Multiselection and menus in torn off
 dialogs

---
 indra/newview/skins/default/xui/en/menu_conversation.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 2e9bda5804..908b2c174f 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -30,12 +30,14 @@
      layout="topleft"
      name="view_profile">
         <on_click function="Avatar.DoToSelected" parameter="view_profile"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_view_profile"/>
     </menu_item_call>
     <menu_item_call
      label="IM"
      layout="topleft"
      name="im">
         <on_click function="Avatar.DoToSelected" parameter="im"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_im"/>
     </menu_item_call>
     <menu_item_call
      label="Offer teleport"
@@ -56,6 +58,7 @@
      layout="topleft"
      name="chat_history">
         <on_click function="Avatar.DoToSelected" parameter="chat_history"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_chat_history"/>
     </menu_item_call>	
     <menu_item_separator layout="topleft" name="separator_chat_history"/>	
     <menu_item_call
@@ -77,6 +80,7 @@
      layout="topleft"
      name="invite_to_group">
         <on_click function="Avatar.DoToSelected" parameter="invite_to_group" />
+        <on_enable function="Avatar.EnableItem" parameter="can_invite" />
     </menu_item_call>
     <menu_item_separator layout="topleft" name="separator_invite_to_group"/>		
     <menu_item_call
@@ -91,12 +95,14 @@
      layout="topleft"
      name="share">
         <on_click function="Avatar.DoToSelected" parameter="share" />
+        <on_enable function="Avatar.EnableItem" parameter="can_share" />
     </menu_item_call>
     <menu_item_call
      label="Pay"
      layout="topleft"
      name="pay">
         <on_click function="Avatar.DoToSelected" parameter="pay" />
+        <on_enable function="Avatar.EnableItem" parameter="can_pay" />
     </menu_item_call>
     <menu_item_check
      label="Block / unblock"
@@ -111,6 +117,7 @@
      layout="topleft"
      name="group_profile">
         <on_click function="Group.DoToSelected" parameter="group_profile"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_group_profile" />
     </menu_item_call>	
     <menu_item_call
      label="Activate Group"
@@ -124,10 +131,9 @@
      layout="topleft"
      name="leave_group">
         <on_click function="Group.DoToSelected" parameter="leave_group"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_leave_group" />
     </menu_item_call>
-	<menu_item_separator
-	 layout="topleft"
-	 name="Moderator Options Separator"/>
+	<menu_item_separator layout="topleft" name="Moderator Options Separator"/>
 	<context_menu
 	 label="Moderator Options"
 	 layout="topleft"
-- 
cgit v1.2.3


From 4aa818055e04739dd0177b9e06e6edea62bf0981 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 26 Nov 2012 13:22:25 -0600
Subject: MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in
 setGraphicsLevel

Reviewed by Simon
---
 .../default/xui/en/panel_preferences_graphics1.xml | 43 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

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

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 f7666bdc4c..849f3ef73d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -55,30 +55,57 @@
      name="LowGraphicsDivet"
      top_delta="-2"
      width="2" />
+  <icon
+     color="0.12 0.12 0.12 1"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="LowMidraphicsDivet"
+     top_delta="-2"
+     width="2" />
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="83"
+     left_pad="41"
      name="MidGraphicsDivet"
      top_delta="0"
      width="2" />
+  <icon
+     color="0.12 0.12 0.12 1"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="MidHighGraphicsDivet"
+     top_delta="0"
+     width="2" />
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="85"
+     left_pad="41"
      name="HighGraphicsDivet"
      top_delta="0"
      width="2" />
+  <icon
+     color="0.12 0.12 0.12 1"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="HighUltraGraphicsDivet"
+     top_delta="0"
+     width="2" />
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="83"
+     left_pad="41"
      name="UltraGraphicsDivet"
      top_delta="0"
      width="2" />
@@ -91,7 +118,7 @@
      initial_value="0"
      layout="topleft"
      left="120"
-     max_val="3"
+     max_val="6"
      name="QualityPerformanceSelection"
      show_text="false"
      top_delta="-2"
@@ -120,12 +147,12 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText2"
+     name="ShadersPrefText3"
      top_delta="0"
      width="80">
         Mid
     </text>
-    <text
+  <text
      type="string"
      length="1"
      follows="left|top"
@@ -136,8 +163,8 @@
      name="ShadersPrefText3"
      top_delta="0"
      width="80">
-        High
-    </text>
+      High
+  </text>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From e2ce144129e53ca7c6f5309cab833d48cdb30b11 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 27 Nov 2012 16:56:53 -0800
Subject: First pass at re-implementing the POST functionality to query values
 for selected visible objects.

---
 .../default/xui/en/floater_debug_materials.xml     | 56 +++++++++++++++-------
 1 file changed, 39 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index cdc1e63ce1..b7624d2b1e 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -3,7 +3,7 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="725"
+    height="746"
     width="1040"
     min_height="750"
     min_width="1040"
@@ -22,6 +22,8 @@
   <floater.string name="status_error">An error occurred during the request.</floater.string>
   <floater.string name="loading_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
   <floater.string name="loading_status_done">Complete</floater.string>
+  <floater.string name="querying_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
+  <floater.string name="querying_status_done">Complete</floater.string>
   <panel
       border="false"
       bevel_style="none"
@@ -65,7 +67,7 @@
       tab_position="top"
       left="10"
       top_pad="10"
-      height="620"
+      height="641"
       width="1020">
     <panel
         border="true"
@@ -73,7 +75,7 @@
         follows="left|top|right"
         layout="topleft"
         label="Current region"
-        height="620"
+        height="641"
         top_pad="10"
         width="1020">
       <panel
@@ -245,7 +247,7 @@
         follows="left|top|right"
         layout="topleft"
         label="Object editing"
-        height="620"
+        height="641"
         top_pad="10"
         width="1010">
       <panel
@@ -856,7 +858,7 @@
         follows="left|top|right"
         layout="topleft"
         label="Viewable objects"
-        height="620"
+        height="641"
         top_pad="10"
         width="1020">
       <panel
@@ -864,7 +866,7 @@
           bevel_style="none"
           follows="left|top|right"
           layout="topleft"
-          height="620"
+          height="641"
           top_pad="0"
           width="1020">
         <panel
@@ -874,7 +876,7 @@
             layout="topleft"
             left="0"
             top_pad="10"
-            height="132"
+            height="153"
             width="835">
           <button
               follows="left|top"
@@ -884,6 +886,34 @@
               name="query_viewable_objects_button"
               top_pad="0"
               width="214"/>
+          <text
+              height="13"
+              word_wrap="true"
+              use_ellipses="false"
+              type="string"
+              text_color="LabelTextColor"
+              length="1"
+              follows="left|top"
+              layout="topleft"
+              left="2"
+              top_pad="8"
+              width="150">
+            Loading Status
+          </text>
+          <text
+              height="13"
+              word_wrap="true"
+              use_ellipses="false"
+              type="string"
+              text_color="MaterialGoodColor"
+              length="1"
+              follows="left|top"
+              layout="topleft"
+              left_pad="0"
+              name="query_status"
+              top_pad="-13"
+              width="400">
+          </text>
           <scroll_list
               column_padding="0"
               draw_heading="true"
@@ -938,19 +968,11 @@
           <button
               follows="left|top"
               height="22"
-              label="Post Good Material ID"
+              label="Post Material ID"
               layout="topleft"
-              name="good_post_button"
+              name="post_button"
               top_pad="0"
               width="214"/>
-          <button
-              follows="left|top"
-              height="22"
-              label="Post Bad Material ID"
-              layout="topleft"
-              name="bad_post_button"
-              left_pad="20"
-              width="214"/>
           <scroll_list
               column_padding="0"
               draw_heading="true"
-- 
cgit v1.2.3


From a44562aa2957d91356b6226517469ed2f0dfb382 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 27 Nov 2012 18:18:01 -0800
Subject: Minor tweaks to the layout of the materials debug panel to adjust for
 the 3rd tab.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index b7624d2b1e..afa93c3618 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -3,9 +3,9 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="746"
+    height="770"
     width="1040"
-    min_height="750"
+    min_height="795"
     min_width="1040"
     layout="topleft"
     name="floater_debug_materials"
@@ -67,7 +67,7 @@
       tab_position="top"
       left="10"
       top_pad="10"
-      height="641"
+      height="670"
       width="1020">
     <panel
         border="true"
@@ -962,7 +962,7 @@
             bevel_style="none"
             follows="left|top|right"
             layout="topleft"
-            height="458"
+            height="457"
             top_pad="10"
             width="1020">
           <button
-- 
cgit v1.2.3


From bf28ce0eea86e4be1de47da83f4855aafe72688a Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 28 Nov 2012 12:10:00 -0800
Subject: sync with viewer-development

---
 .../skins/default/xui/de/panel_navmesh_rebake.xml  |  6 ---
 indra/newview/skins/default/xui/en/menu_object.xml | 40 +++++++++----------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++-
 .../newview/skins/default/xui/en/notifications.xml | 20 ----------
 .../skins/default/xui/en/panel_navmesh_rebake.xml  | 45 ----------------------
 .../skins/default/xui/es/panel_navmesh_rebake.xml  |  6 ---
 .../skins/default/xui/fr/panel_navmesh_rebake.xml  |  6 ---
 .../skins/default/xui/it/panel_navmesh_rebake.xml  |  6 ---
 .../skins/default/xui/ja/panel_navmesh_rebake.xml  |  6 ---
 .../skins/default/xui/pt/panel_navmesh_rebake.xml  |  6 ---
 .../skins/default/xui/ru/panel_navmesh_rebake.xml  |  6 ---
 .../skins/default/xui/tr/panel_navmesh_rebake.xml  |  6 ---
 12 files changed, 29 insertions(+), 134 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml

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

diff --git a/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
deleted file mode 100644
index 44be6d67b1..0000000000
--- a/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Region neu formen" name="navmesh_btn" tool_tip="Klicken, um das Navmesh der Region neu zu formen."/>
-	<button label="Neuformen wird angefordert" name="navmesh_btn_sending" tool_tip="Anforderung zum Neuformen wird an den Server gesendet."/>
-	<button label="Region wird neu geformt" name="navmesh_btn_baking" tool_tip="Region wird neu geformt. Nach Abschluss des Vorgangs verschwindet diese Schaltfläche."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 52b9524b11..f6004621a6 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -29,26 +29,6 @@
     <menu_item_call.on_enable
         function="EnableEdit"/>
   </menu_item_call>
-  <menu_item_call
-      label="Show in linksets"
-      name="show_in_linksets">
-    <menu_item_call.on_click
-        function="Pathfinding.Linksets.Select" />
-    <menu_item_call.on_enable
-        function="EnableSelectInPathfindingLinksets"/>
-    <menu_item_call.on_visible
-        function="EnableSelectInPathfindingLinksets"/>
-  </menu_item_call>
-  <menu_item_call
-      label="Show in characters"
-      name="show_in_characters">
-    <menu_item_call.on_click
-        function="Pathfinding.Characters.Select" />
-    <menu_item_call.on_enable
-        function="EnableSelectInPathfindingCharacters"/>
-    <menu_item_call.on_visible
-        function="EnableSelectInPathfindingCharacters"/>
-  </menu_item_call>
   <menu_item_call
       enabled="false"
       label="Open"
@@ -90,6 +70,26 @@
     <menu_item_call.on_click
         function="Object.ZoomIn" />
   </menu_item_call>
+  <menu_item_call
+      label="Show in linksets"
+      name="show_in_linksets">
+    <menu_item_call.on_click
+        function="Pathfinding.Linksets.Select" />
+    <menu_item_call.on_enable
+        function="EnableSelectInPathfindingLinksets"/>
+    <menu_item_call.on_visible
+        function="EnableSelectInPathfindingLinksets"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Show in characters"
+      name="show_in_characters">
+    <menu_item_call.on_click
+        function="Pathfinding.Characters.Select" />
+    <menu_item_call.on_enable
+        function="EnableSelectInPathfindingCharacters"/>
+    <menu_item_call.on_visible
+        function="EnableSelectInPathfindingCharacters"/>
+  </menu_item_call>
   <menu_item_separator layout="topleft" />
   <context_menu
       label="Put On"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..18932a32d0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -956,7 +956,7 @@
          create_jump_keys="true"
          label="Pathfinding"
          name="Pathfinding"
-         tear_off="false">
+         tear_off="true">
         <menu_item_call
             label="Linksets..."
             name="pathfinding_linksets_menu_item">
@@ -984,6 +984,14 @@
           <menu_item_call.on_enable
               function="Tools.EnablePathfindingView" />
         </menu_item_call>
+        <menu_item_call
+            label="Rebake region"
+            name="pathfinding_rebake_navmesh_item">
+          <menu_item_call.on_click
+              function="Tools.DoPathfindingRebakeRegion"/>
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfindingRebakeRegion" />
+        </menu_item_call>
       </menu>
 
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8e6de6ed4f..9dae77a304 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6074,26 +6074,6 @@ This area has building disabled. You can&apos;t build or rez objects here.
     Dynamic pathfinding is not enabled on this region.  Scripted objects using pathfinding LSL calls may not operate as expected on this region.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="PathfindingRebakeNavmesh"
-   type="alertmodal">
-    <unique/>
-    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make moving objects behave correctly, click the “Rebake region” button.  Choose “Help” for more information.
-    <url
-      option="1"
-      name="url"
-      target = "_external">
-      http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-    </url>
-    <usetemplate
-     name="okhelpignore"
-     ignoretext="Changing certain objects in this region could cause other moving objects to behave incorrectly."
-     yestext="OK"
-     helptext="Help"
-     />
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="PathfindingCannotRebakeNavmesh"
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
deleted file mode 100644
index 90308a2ca9..0000000000
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-    height="25"
-    layout="topleft"
-    name="panel_navmesh_rebake"
-    mouse_opaque="false"
-    visible="true"
-    width="133">
-  <button
-      follows="left|bottom"
-      height="19"
-      label="Rebake region"
-      layout="topleft"
-      left="10"
-      name="navmesh_btn"
-      tool_tip="Click to rebake the region&apos;s navmesh."
-      top="2"
-      visible="false"
-      enabled="true"
-      width="120" />
-  <button
-      follows="left|bottom"
-      height="19"
-      label="Requesting rebake"
-      layout="topleft"
-      left="10"
-      name="navmesh_btn_sending"
-      tool_tip="Sending rebake request to the server."
-      top="2"
-      visible="false"
-      enabled="false"
-      width="120" />
-  <button
-      follows="left|bottom"
-      height="19"
-      label="Region is rebaking"
-      layout="topleft"
-      left="10"
-      name="navmesh_btn_baking"
-      tool_tip="Region is being rebaked.  When completed, this button will disappear."
-      top="2"
-      visible="false"
-      enabled="false"
-      width="120" />
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
deleted file mode 100644
index 96df844512..0000000000
--- a/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Recargar la región" name="navmesh_btn" tool_tip="Pulsa para recargar el navmesh de la región."/>
-	<button label="Solicitando recarga" name="navmesh_btn_sending" tool_tip="Enviando la solicitud de recarga al servidor."/>
-	<button label="La región se está recargando" name="navmesh_btn_baking" tool_tip="La región se está recargando.  Este botón desaparecerá cuando finalice la recarga."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
deleted file mode 100644
index 7acf092257..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Refiger la région" name="navmesh_btn" tool_tip="Cliquer pour refiger le maillage de navigation de la région."/>
-	<button label="Demande consistant à refiger la région en cours..." name="navmesh_btn_sending" tool_tip="Envoi de la demande consistant à refiger la région au serveur..."/>
-	<button label="La région se refige..." name="navmesh_btn_baking" tool_tip="La région se refige. Ce bouton disparaîtra lorsque le processus sera terminé."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
deleted file mode 100644
index 432754076a..0000000000
--- a/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Rebake regione" name="navmesh_btn" tool_tip="Fai clic per eseguire rebake sul navmesh della regione"/>
-	<button label="Richiesta rebake" name="navmesh_btn_sending" tool_tip="Invio richiesta rebake al server."/>
-	<button label="Rebake regione in corso" name="navmesh_btn_baking" tool_tip="Rebake della regione in corso.  Al termine, questo pulsante non sarà più visibile."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
deleted file mode 100644
index ea3ec32424..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="地域の再構築" name="navmesh_btn" tool_tip="クリックしてこの地域のナビメッシュを再構築します。"/>
-	<button label="再構築をリクエスト中" name="navmesh_btn_sending" tool_tip="再構築リクエストをサーバーに送信しています。"/>
-	<button label="地域（リージョン）を再構築中" name="navmesh_btn_baking" tool_tip="地域を再構築しています。完了すると、このボタンは消えます。"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
deleted file mode 100644
index aa885ae031..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Recarregar região" name="navmesh_btn" tool_tip="Clique para recarregar o navmesh da região."/>
-	<button label="Solicitando recarregamento" name="navmesh_btn_sending" tool_tip="Enviando solicitação de recarregamento para o servidor."/>
-	<button label="A região está recarregando" name="navmesh_btn_baking" tool_tip="A região está sendo recarregada.  Este botão desaparecerá após a conclusão."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
deleted file mode 100644
index fdc374a024..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Восстановить регион" name="navmesh_btn" tool_tip="Восстановить навигационную сетку региона."/>
-	<button label="Запрос на восстановление" name="navmesh_btn_sending" tool_tip="Отправка запроса на восстановление на сервер."/>
-	<button label="Идет восстановление региона" name="navmesh_btn_baking" tool_tip="Идет восстановление региона.  Когда оно завершится, эта кнопка исчезнет."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
deleted file mode 100644
index 78cb8bcc02..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="Bölgeyi yeniden kaydet" name="navmesh_btn" tool_tip="Bölgenin navigasyon örgüsünü tekrar kaydetmek için tıkla."/>
-	<button label="Yeniden kaydetme talep ediliyor" name="navmesh_btn_sending" tool_tip="Yeniden kaydetme talebi sunucuya gönderiliyor."/>
-	<button label="Bölge yeniden kaydediliyor" name="navmesh_btn_baking" tool_tip="Bölge yeniden kaydediliyor.  Tamamlandığında bu düğme kaybolacak."/>
-</panel>
-- 
cgit v1.2.3


From 611797543a917f1596be73e9e79974578748086e Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 29 Nov 2012 15:03:35 -0800
Subject: CHUI-489: Removed the 'Group Messages' checkbox. This was a design
 change in the spec.

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 0c94b6b223..37bfbae991 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -341,22 +341,13 @@
         top_pad="6"
         name="incoming_voice_call"
         width="150" />
-    <check_box
-        enabled="false"
-        control_name="PlaySoundGroupChatMessages"
-        height="16"
-        label="Group chat messages"
-        layout="topleft"
-        top_pad="6"
-        name="group_chat_messages"
-        width="150" />
     <check_box
         control_name="PlaySoundTeleportOffer"
         height="16"
         label="Teleport offer"
         layout="topleft"
         left_pad="35"
-        top_pad="-59"
+        top_pad="-38"
         name="teleport_offer"
         width="150" />
     <check_box
-- 
cgit v1.2.3


From 15157ecb095838f402edb750b87ea0bdb9fb56f7 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 29 Nov 2012 03:27:45 +0200
Subject: CHUI-553 FIXED Remove the conversation chiclet

---
 .../skins/default/xui/en/menu_im_well_button.xml   | 16 --------
 .../skins/default/xui/en/panel_chiclet_bar.xml     | 48 ----------------------
 2 files changed, 64 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/menu_im_well_button.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_im_well_button.xml b/indra/newview/skins/default/xui/en/menu_im_well_button.xml
deleted file mode 100644
index f8dfba91ff..0000000000
--- a/indra/newview/skins/default/xui/en/menu_im_well_button.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu
- layout="topleft"
- name="IM Well Button Context Menu">
-    <menu_item_call
-     label="Close All"
-     layout="topleft"
-     name="Close All">
-        <menu_item_call.on_click
-         function="IMWellChicletMenu.Action"
-         parameter="close all" />
-        <menu_item_call.on_enable
-         function="IMWellChicletMenu.EnableItem"
-         parameter="can close all" />
-    </menu_item_call>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index ff0146490b..fc321fdd23 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -80,54 +80,6 @@
     <layout_panel auto_resize="false"
                       width="4"
                       min_width="4"/>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="im_well_panel"
-         top="0"
-         width="37">
-      <chiclet_im_well
-             follows="right"
-             height="28"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="im_well"
-             top="0"
-             width="35">
-        <!--
-Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
-xml attribute           Description
-image_unselected        "Unlit" - there are no new messages
-image_selected          "Unlit" + "Selected" - there are no new messages and the Well is open
-image_pressed           "Lit" - there are new messages
-image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
-             -->
-        <button
-                 auto_resize="false"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Unread_IM"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread IM messages"
-                 tool_tip="Conversations"
-                 width="34">
-          <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="im_well_window" />
-        </button>
-      </chiclet_im_well>
-    </layout_panel>
     <layout_panel
          auto_resize="false"
          follows="right"
-- 
cgit v1.2.3


From e83700b56dcf2b0f392b49a79123b78bc7c8fbd9 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 30 Nov 2012 17:03:12 -0600
Subject: MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging
 people to update their drivers.

Reviewed by Simon
---
 .../newview/skins/default/xui/en/notifications.xml | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c32e23d553..648a1895c4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1291,6 +1291,45 @@ Visit [_URL] for more information?
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="AMDOldDriver"
+   type="alertmodal">
+    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://support.amd.com/us/Pages/AMDSupportHub.aspx
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="NVIDIAOldDriver"
+ type="alertmodal">
+    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://www.nvidia.com/Download/index.aspx?lang=en-us
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="UnknownGPU"
-- 
cgit v1.2.3


From 566fbe751a4094db7c3d553d3866f0c057db18c9 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 2 Dec 2012 00:39:45 +0100
Subject: Changed line editors to spin controls for all material float
 parameters in the debug floater

---
 .../default/xui/en/floater_debug_materials.xml     | 326 +++++++--------------
 1 file changed, 112 insertions(+), 214 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index afa93c3618..b6c105e19a 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -302,136 +302,85 @@
                 mouse_opaque="true"
                 name="normal_map"
                 tool_tip="Click to open texture picker" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-260"
-                top_pad="10"
-                width="160">
-              Normal Map Offset X
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
+                left_pad="-260"
+                label="Normal Map Offset X"
+                max_val="1.0"
+                min_val="-1.0"
                 name="normal_map_offset_x"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-240"
-                top_pad="10"
-                width="160">
-              Normal Map Offset Y
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="normal_map_offset_y"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
                 left_pad="-240"
+                label="Normal Map Offset Y"
+                max_val="1.0"
+                min_val="-1.0"
+                name="normal_map_offset_y"
                 top_pad="10"
-                width="160">
-              Normal Map Repeat X
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="normal_map_repeat_x"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
                 left_pad="-240"
+                label="Normal Map Repeat X"
+                max_val="64"
+                min_val="0.0"
+                name="normal_map_repeat_x"
                 top_pad="10"
-                width="160">
-              Normal Map Repeat Y
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="normal_map_repeat_y"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
                 left_pad="-240"
+                max_val="64"
+                min_val="0.0"
+                label="Normal Map Repeat Y"
+                name="normal_map_repeat_y"
                 top_pad="10"
-                width="160">
-              Normal Map Rotation
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
+                initial_value="0"
+                increment="1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
+                left_pad="-240"
+                label="Normal Map Rotation"
+                max_val="9999"
+                min_val="-9999"
                 name="normal_map_rotation"
-                width="80" />
+                top_pad="10"
+                width="240" />
           </panel>
           <panel
               border="false"
@@ -469,136 +418,85 @@
                 mouse_opaque="true"
                 name="specular_map"
                 tool_tip="Click to open texture picker" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-260"
-                top_pad="10"
-                width="160">
-              Specular Map Offset X
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
+                left_pad="-260"
+                label="Specular Map Offset X"
+                max_val="1.0"
+                min_val="-1.0"
                 name="specular_map_offset_x"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-240"
-                top_pad="10"
-                width="160">
-              Specular Map Offset Y
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="specular_map_offset_y"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
                 left_pad="-240"
+                label="Specular Map Offset Y"
+                max_val="1.0"
+                min_val="-1.0"
+                name="specular_map_offset_y"
                 top_pad="10"
-                width="160">
-              Specular Map Repeat X
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="specular_map_repeat_x"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
                 left_pad="-240"
+                label="Specular Map Repeat X"
+                max_val="64"
+                min_val="0.0"
+                name="specular_map_repeat_x"
                 top_pad="10"
-                width="160">
-              Specular Map Repeat Y
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="specular_map_repeat_y"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
+                initial_value="0"
+                increment="0.1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
                 left_pad="-240"
+                label="Specular Map Repeat Y"
+                max_val="64"
+                min_val="0.0"
+                name="specular_map_repeat_y"
                 top_pad="10"
-                width="160">
-              Specular Map Rotation
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
+                width="240" />
+            <spinner
+                allow_text_entry="true"
                 follows="left|top"
                 height="20"
+                initial_value="0"
+                increment="1"
+                decimal_digits="4"
+                label_width="160"
                 layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
+                left_pad="-240"
+                label="Specular Map Rotation"
+                max_val="9999"
+                min_val="-9999"
                 name="specular_map_rotation"
-                width="80" />
+                top_pad="10"
+                width="240" />
           </panel>
           <panel
               border="false"
-- 
cgit v1.2.3


From 1e26dbdcd27a1f29fe249cc7e074e5ede284bac8 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 3 Dec 2012 01:46:26 +0100
Subject: Started LLMaterialMgr to handle viewer<->region materials
 communication   * refactored LLFloaterDebugMaterials::requestPutMaterials()
 to use LLMaterialMgr instead   * replaced "Object editing" results list with
 information about the active selection instead

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index b6c105e19a..3a450fdeff 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -720,24 +720,24 @@
               left="0"
               top_pad="0"
               width="160">
-            Results
+            Active selection
           </text>
           <scroll_list
               column_padding="0"
               draw_heading="true"
               follows="left|top|right"
-              height="100"
+              height="300"
               layout="topleft"
               left="0"
               top_pad="10"
               tab_stop="false"
               multi_select="true"
               name="put_scroll_list"
-              width="400">
+              width="600">
             <scroll_list.columns
                 label="Object ID"
                 name="object_id"
-                width="80" />
+                width="225" />
             <scroll_list.columns
                 label="Face Index"
                 name="face_index"
-- 
cgit v1.2.3


From f888a3fd00ca32275ab2da6437cb011b3ab78f89 Mon Sep 17 00:00:00 2001
From: MaximB ProductEngine <mberezhnoy@productengine.com>
Date: Mon, 3 Dec 2012 16:21:48 +0200
Subject: CHUI-556 (Tooltip on call button incorrect when call is active)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1d74f1bc25..faf54774f6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -43,6 +43,12 @@
      <floater.string
      name="tooltip_to_main_window"
      value="Move this conversation back to main window"/>
+  <floater.string
+     name="start_call_button_tooltip"
+     value="Open voice connection"/>
+  <floater.string
+     name="end_call_button_tooltip"
+     value="Close voice connection"/>
     <view
         follows="all"
         layout="topleft"
-- 
cgit v1.2.3


From 8c24cc8e3635888b766e30001749966eddc0dc7e Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 4 Dec 2012 14:38:19 +0200
Subject: CHUI-527 FIXED Changed term to "Multi-person chat"

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a884ac94d6..c75bd98c38 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3400,7 +3400,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Connecting...
   </string>
   <string name="conference-title">
-    Ad-hoc Conference
+    Multi-person chat
   </string>
   <string name="conference-title-incoming">
     Conference with [AGENT_NAME]
-- 
cgit v1.2.3


From f1155c4fa5e9a4eaa5b4d452fc46a2246fb305bd Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 4 Dec 2012 04:14:51 +0200
Subject: CHUI-573 FIXED Notification chiclet shown when object chiclets are
 shown

---
 .../skins/default/xui/da/menu_im_well_button.xml   |  4 -
 .../xui/da/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/de/menu_im_well_button.xml   |  4 -
 .../xui/de/menu_notification_well_button.xml       |  4 -
 .../xui/en/menu_notification_well_button.xml       | 16 ----
 .../skins/default/xui/en/panel_activeim_row.xml    | 97 ----------------------
 .../skins/default/xui/en/panel_chiclet_bar.xml     | 44 ----------
 .../default/xui/en/widgets/chiclet_im_adhoc.xml    | 55 ------------
 .../default/xui/en/widgets/chiclet_im_group.xml    | 56 -------------
 .../default/xui/en/widgets/chiclet_im_p2p.xml      | 56 -------------
 .../skins/default/xui/es/menu_im_well_button.xml   |  4 -
 .../xui/es/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/fr/menu_im_well_button.xml   |  4 -
 .../xui/fr/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/it/menu_im_well_button.xml   |  4 -
 .../xui/it/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/ja/menu_im_well_button.xml   |  4 -
 .../xui/ja/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/pl/menu_im_well_button.xml   |  4 -
 .../xui/pl/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/pt/menu_im_well_button.xml   |  4 -
 .../xui/pt/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/ru/menu_im_well_button.xml   |  4 -
 .../xui/ru/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/tr/menu_im_well_button.xml   |  4 -
 .../xui/tr/menu_notification_well_button.xml       |  4 -
 .../skins/default/xui/zh/menu_im_well_button.xml   |  4 -
 .../xui/zh/menu_notification_well_button.xml       |  4 -
 28 files changed, 412 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_activeim_row.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_notification_well_button.xml

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

diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
deleted file mode 100644
index 4889230919..0000000000
--- a/indra/newview/skins/default/xui/da/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Luk alle" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
deleted file mode 100644
index 40b35b5fdd..0000000000
--- a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Luk alle" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_well_button.xml b/indra/newview/skins/default/xui/de/menu_im_well_button.xml
deleted file mode 100644
index f464b71f4a..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Alle schließen" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
deleted file mode 100644
index 0f2784f160..0000000000
--- a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Alle schließen" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
deleted file mode 100644
index 263ac40f4e..0000000000
--- a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu
- layout="topleft"
- name="Notification Well Button Context Menu">
-    <menu_item_call
-     label="Close All"
-     layout="topleft"
-     name="Close All">
-        <menu_item_call.on_click
-         function="NotificationWellChicletMenu.Action"
-         parameter="close all" />
-        <menu_item_call.on_enable
-         function="NotificationWellChicletMenu.EnableItem"
-         parameter="can close all" />
-    </menu_item_call>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
deleted file mode 100644
index 9369d1b5cf..0000000000
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	name="panel_activeim_row"
-	layout="topleft"
-	follows="left|right"
-	top="0"
-	left="0"
-	height="35"
-	width="318"
-  background_opaque="false"
-  background_visible="true"
-  bg_alpha_color="0.0 0.0 0.0 0.0" >
-  <chiclet_im_p2p
-		name="p2p_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_p2p"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_p2p>
-  <chiclet_im_group
-		name="group_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_grp"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_group>
-  <chiclet_im_adhoc
-		name="adhoc_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_hoc"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_adhoc>
-	<text
-	    translate="false"
-		type="string"
-		name="contact_name"
-		layout="topleft"
-		top="10"
-		left_pad="10"
-		height="14"
-		width="250"
-		length="1"
-		follows="right|left"
-		parse_urls="false"
-		use_ellipses="true"
-		font="SansSerifBold">
-    TestString PleaseIgnore
-  </text>
-  <button
-    top="10"
-    right="-5"
-    width="17"
-    height="17"
-    layout="topleft"
-    follows="right"
-    name="hide_btn"
-    mouse_opaque="true"
-    label=""
-    tab_stop="false"
-    image_unselected="Toast_CloseBtn"
-    image_selected="Toast_CloseBtn"
-  />
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index fc321fdd23..390047d493 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -77,49 +77,5 @@
                  width="12" />
       </chiclet_panel>
     </layout_panel>
-    <layout_panel auto_resize="false"
-                      width="4"
-                      min_width="4"/>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="notification_well_panel"
-         top="0"
-         width="37">
-      <chiclet_notification
-             follows="right"
-             height="23"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="notification_well"
-             top="5"
-             width="35">
-        <button
-                 auto_resize="false"
-                 bottom_pad="3"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Notices_Unread"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread"
-                 tool_tip="Notifications"
-                 width="34">
-          <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="notification_well_window" />
-        </button>
-      </chiclet_notification>
-    </layout_panel>
   </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
deleted file mode 100644
index 0e29ed0d0b..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_adhoc
- height="23"
- name="im_adhoc_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_adhoc.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25" />
-    <chiclet_im_adhoc.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"      
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_adhoc.avatar_icon
-     bottom="3"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="adhoc_icon"
-     width="21" />
-    <chiclet_im_adhoc.unread_notifications
-     halign="center"
-     height="23"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20" />
-    <chiclet_im_adhoc.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
deleted file mode 100644
index 77011139bf..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_group
- height="23"
- name="im_group_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_group.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25" />
-    <chiclet_im_group.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"      
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_group.group_icon
-     bottom="3"
-     default_icon="Generic_Group"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="group_icon"
-     width="21" />
-    <chiclet_im_group.unread_notifications
-     height="23"
-     halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20"/>
-    <chiclet_im_group.new_message_icon
-bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
deleted file mode 100644
index 8b56a8f0f6..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_p2p
- height="23"
- name="im_p2p_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_p2p.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25"/>
-    <chiclet_im_p2p.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_p2p.avatar_icon
-     bottom="3"
-     color="white"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="avatar_icon"
-     width="21" />
-    <chiclet_im_p2p.unread_notifications
-     height="23"
-     halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20"/>
-    <chiclet_im_p2p.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_p2p>
diff --git a/indra/newview/skins/default/xui/es/menu_im_well_button.xml b/indra/newview/skins/default/xui/es/menu_im_well_button.xml
deleted file mode 100644
index c8f6c217cc..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Cerrar todo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
deleted file mode 100644
index 0562d35be7..0000000000
--- a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Cerrar todo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml b/indra/newview/skins/default/xui/fr/menu_im_well_button.xml
deleted file mode 100644
index 8ef1529e6b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Tout fermer" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
deleted file mode 100644
index 323bfdbf16..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Tout fermer" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_well_button.xml b/indra/newview/skins/default/xui/it/menu_im_well_button.xml
deleted file mode 100644
index 9e471b771c..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Chiudi tutto" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
deleted file mode 100644
index 8c82e30f0e..0000000000
--- a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Chiudi tutto" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml b/indra/newview/skins/default/xui/ja/menu_im_well_button.xml
deleted file mode 100644
index 3397004bd7..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="すべて閉じる" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
deleted file mode 100644
index 913bae8958..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="すべて閉じる" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml b/indra/newview/skins/default/xui/pl/menu_im_well_button.xml
deleted file mode 100644
index 207bc2211b..0000000000
--- a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Zamknij wszystkie" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
deleted file mode 100644
index bd3d42f9b1..0000000000
--- a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Zamknij" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
deleted file mode 100644
index 2d37cefd6f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Fechar tudo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
deleted file mode 100644
index 43ad4134ec..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Fechar tudo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml b/indra/newview/skins/default/xui/ru/menu_im_well_button.xml
deleted file mode 100644
index 5a5bde61b9..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Закрыть все" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
deleted file mode 100644
index 4d067e232a..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Закрыть все" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml b/indra/newview/skins/default/xui/tr/menu_im_well_button.xml
deleted file mode 100644
index c3e559a723..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Tümünü Kapat" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
deleted file mode 100644
index 39c66268f5..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="Tümünü Kapat" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml b/indra/newview/skins/default/xui/zh/menu_im_well_button.xml
deleted file mode 100644
index 4b9b4b2758..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="全部關閉" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
deleted file mode 100644
index b629f73584..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="全部關閉" name="Close All"/>
-</context_menu>
-- 
cgit v1.2.3


From 7527431bedce5529d33add21ec53336800f48fd0 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Wed, 5 Dec 2012 13:54:55 +0200
Subject: CHUI-572 FIXED Changed initial position for floaters according to
 description.

---
 indra/newview/skins/default/xui/en/floater_camera.xml       | 2 +-
 indra/newview/skins/default/xui/en/floater_destinations.xml | 7 ++++---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 9 +++++----
 indra/newview/skins/default/xui/en/floater_moveview.xml     | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 22bc488a92..4b4821a383 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="458"
+ left="643"
  bottom="-80"
  follows="left|bottom"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 39aa8e07bb..41b57530fc 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- positioning="cascading"
  ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
@@ -12,16 +11,18 @@
  height="230"
  layout="topleft"
  name="Destinations"
+ right="-10"
+ bottom="-80"
  single_instance="true"
  help_topic="destinations"
  save_rect="true"
  save_visibility="true"
  title="DESTINATIONS"
- width="840">
+ width="550">
     <web_browser
       top="25"
       height="200"
-      width="840"
+      width="550"
       follows="all"
       name="destination_guide_contents"
       trusted_content="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 4aa7c88312..152c897120 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -3,7 +3,7 @@
  can_close="true"  
  can_minimize="true"
  can_resize="true"
- height="430"
+ height="230"
  layout="topleft"
  min_height="50"
  name="floater_im_box"
@@ -13,7 +13,8 @@
  single_instance="true"
  reuse_instance="true"
  title="CONVERSATIONS"
- width="680">
+ bottom="-80"
+ width="450">
     <string
      name="collapse_icon"
      value="Conv_toolbar_collapse"/>
@@ -23,13 +24,13 @@
     <layout_stack
      animate="true" 
      follows="all"
-     height="430"
+     height="230"
      layout="topleft"
      left="0"
      name="conversations_stack"
      orientation="horizontal"
      top="0"
-     width="680">
+     width="450">
         <layout_panel
          auto_resize="true"
          user_resize="true"        
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 4e7ee7913f..02d9805ddf 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="320"
+ left="505"
  bottom="-80"
  legacy_header_height="18"
  can_dock="false"
-- 
cgit v1.2.3


From e0b1b063c14081a7c53ab5620db20385e1f2bbbd Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Wed, 5 Dec 2012 20:03:15 +0200
Subject: CHUI-577 FIXED "Mute text" and "Block voice" items are added to
 context menu instead of "Block\unblock"

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 908b2c174f..e8265fe482 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -105,14 +105,21 @@
         <on_enable function="Avatar.EnableItem" parameter="can_pay" />
     </menu_item_call>
     <menu_item_check
-     label="Block / unblock"
+     label="Block Voice"
      layout="topleft"
      name="block_unblock">
         <on_click function="Avatar.DoToSelected" parameter="block_unblock" />
 		<on_check function="Avatar.CheckItem" parameter="is_blocked" />
 		<on_enable  function="Avatar.EnableItem" parameter="can_block" />
     </menu_item_check>
-	<menu_item_call
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="MuteText">
+     <on_click function="Avatar.DoToSelected" parameter="mute_unmute"/>
+     <on_check function="Avatar.CheckItem" parameter="is_muted" />
+     <on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    <menu_item_call
      label="Group Profile"
      layout="topleft"
      name="group_profile">
-- 
cgit v1.2.3


From fc000880b40143534c47c475a7a0aba6ab75039e Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 5 Dec 2012 20:47:21 +0200
Subject: CHUI-519 FIXED Do not put offered items into the trash while in Busy
 / DND mode

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index e8265fe482..01ef8ebdb5 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -116,9 +116,10 @@
      label="Block Text"
      layout="topleft"
      name="MuteText">
-     <on_click function="Avatar.DoToSelected" parameter="mute_unmute"/>
+     <on_click function="Avatar.DoToSelected" parameter="mute_unmute" />
      <on_check function="Avatar.CheckItem" parameter="is_muted" />
      <on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    </menu_item_check>
     <menu_item_call
      label="Group Profile"
      layout="topleft"
-- 
cgit v1.2.3


From 935b3326254f75af876b6c9aeb1648ac3a9802cf Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Fri, 7 Dec 2012 15:03:32 +0200
Subject: CHUI-427 FIXED Voice button is added to Conversations floater.

---
 .../newview/skins/default/xui/en/floater_im_container.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 152c897120..a3648f3c9d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -73,13 +73,26 @@
                      image_hover_unselected="Toolbar_Middle_Over"
                      image_overlay="Conv_toolbar_plus"
                      image_selected="Toolbar_Middle_Selected"
-                      image_unselected="Toolbar_Middle_Off"
+                     image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
                      top="5"
                      left_pad="4"
                      name="add_btn"
                      tool_tip="Start a new conversation"
                      width="31"/>
+                    <button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Command_Speak_Icon"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="5"
+                     left_pad="4"
+                     name="speak_btn"
+                     tool_tip="Speak with people using your microphone"
+                     width="31"/>	
                 </layout_panel>
                 <layout_panel
                  auto_resize="false"
-- 
cgit v1.2.3


From b3e667cc0e3c0c08fc8caed1408ceaa2798875b1 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 7 Dec 2012 15:13:26 +0200
Subject: CHUI-582 : fixed : Resizing conversation floater initially only
 resizes conversation list width.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index a3648f3c9d..9f6503d799 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -32,7 +32,7 @@
      top="0"
      width="450">
         <layout_panel
-         auto_resize="true"
+         auto_resize="false"
          user_resize="true"        
          height="430"
          name="conversations_layout_panel"
-- 
cgit v1.2.3


From f49d47b3041c6b36b36a23b67eec609e95494acc Mon Sep 17 00:00:00 2001
From: MaximB ProductEngine <mberezhnoy@productengine.com>
Date: Mon, 10 Dec 2012 17:22:56 +0200
Subject: CHUI-394 (Group moderation tools missing in right click menus)

---
 indra/newview/skins/default/xui/en/menu_conversation.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 01ef8ebdb5..e0edf384d6 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -156,18 +156,11 @@
 		</menu_item_check>
 		<menu_item_separator layout="topleft" name="moderate_voice_separator" />
 		<menu_item_call
-		 label="Mute this participant"
+		 label="Toggle mute this participant"
 		 layout="topleft"
-		 name="ModerateVoiceMuteSelected">
+		 name="ModerateVoiceToggleMuteSelected">
 			<on_click function="Avatar.DoToSelected" parameter="selected" />
-			<on_enable function="Avatar.EnableItem" parameter="can_mute" />
-		</menu_item_call>
-		<menu_item_call
-		 label="Unmute this participant"
-		 layout="topleft"
-		 name="ModerateVoiceUnMuteSelected">
-			<on_click function="Avatar.DoToSelected" parameter="selected" />
-			<on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+			<on_enable function="Avatar.EnableItem" parameter="can_mute_unmute" />
 		</menu_item_call>
 		<menu_item_call
 		 label="Mute everyone"
-- 
cgit v1.2.3


From 6b1ab1b81c6b23a1947d0038686e294b6344eddb Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 11 Dec 2012 15:20:46 +0200
Subject: CHUI-587 FIXED Disable menu item if "KeepConversationLogTranscripts"
 is false.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b1e3a2d41f..3e7329c0b5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -261,6 +261,8 @@
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="conversation" />
+            <menu_item_check.on_enable
+             function="Conversation.IsConversationLoggingAllowed" />
             <menu_item_check.on_click
              function="Floater.Toggle"
              parameter="conversation" />
-- 
cgit v1.2.3


From 13956ab25d76ef3373d2a06795b92b24364f63cf Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 11 Dec 2012 17:16:32 +0200
Subject: CHUI-572 FIXED Changed initial position for floaters according to
 screenshot.

---
 indra/newview/skins/default/xui/en/floater_camera.xml       | 4 ++--
 indra/newview/skins/default/xui/en/floater_destinations.xml | 3 +--
 indra/newview/skins/default/xui/en/floater_im_container.xml | 3 ++-
 indra/newview/skins/default/xui/en/floater_moveview.xml     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 4b4821a383..521389d7b3 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="643"
- bottom="-80"
+ right="-460"
+ bottom="-50"
  follows="left|bottom"
  legacy_header_height="18"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 41b57530fc..94ebaa9cb2 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ positioning="cascading"	
  ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
@@ -11,8 +12,6 @@
  height="230"
  layout="topleft"
  name="Destinations"
- right="-10"
- bottom="-80"
  single_instance="true"
  help_topic="destinations"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 9f6503d799..1128b8fef6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -13,7 +13,8 @@
  single_instance="true"
  reuse_instance="true"
  title="CONVERSATIONS"
- bottom="-80"
+ bottom="-50"
+ right="-5"
  width="450">
     <string
      name="collapse_icon"
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 02d9805ddf..5e84283ab0 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="505"
- bottom="-80"
+ right="-693"
+ bottom="-50"
  legacy_header_height="18"
  can_dock="false"
  can_minimize="true"
-- 
cgit v1.2.3


From aa3a65f5aaa824fe1d24b0f77f9e717681e2d055 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 12 Dec 2012 13:58:24 -0600
Subject: MAINT-2087 Cleanup XML changes from new preferences hash marks

---
 .../default/xui/en/panel_preferences_graphics1.xml    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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

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 849f3ef73d..15ca3434fe 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -47,7 +47,7 @@
         Better
     </text>
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -56,16 +56,15 @@
      top_delta="-2"
      width="2" />
   <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
      left_pad="41"
-     name="LowMidraphicsDivet"
-     top_delta="-2"
+     name="LowMidGraphicsDivet"
      width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -74,7 +73,7 @@
      top_delta="0"
      width="2" />
   <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -83,7 +82,7 @@
      top_delta="0"
      width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -92,7 +91,7 @@
      top_delta="0"
      width="2" />
   <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -101,7 +100,7 @@
      top_delta="0"
      width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -147,7 +146,7 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText3"
+     name="ShadersPrefText2"
      top_delta="0"
      width="80">
         Mid
-- 
cgit v1.2.3


From 739437e56282a04260af0ffad536e4f037a4e3a8 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 12 Dec 2012 17:01:38 -0800
Subject: sync with viewer-development

---
 .../default/xui/en/panel_preferences_graphics1.xml | 43 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

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

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 f7666bdc4c..849f3ef73d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -55,30 +55,57 @@
      name="LowGraphicsDivet"
      top_delta="-2"
      width="2" />
+  <icon
+     color="0.12 0.12 0.12 1"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="LowMidraphicsDivet"
+     top_delta="-2"
+     width="2" />
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="83"
+     left_pad="41"
      name="MidGraphicsDivet"
      top_delta="0"
      width="2" />
+  <icon
+     color="0.12 0.12 0.12 1"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="MidHighGraphicsDivet"
+     top_delta="0"
+     width="2" />
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="85"
+     left_pad="41"
      name="HighGraphicsDivet"
      top_delta="0"
      width="2" />
+  <icon
+     color="0.12 0.12 0.12 1"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="HighUltraGraphicsDivet"
+     top_delta="0"
+     width="2" />
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="83"
+     left_pad="41"
      name="UltraGraphicsDivet"
      top_delta="0"
      width="2" />
@@ -91,7 +118,7 @@
      initial_value="0"
      layout="topleft"
      left="120"
-     max_val="3"
+     max_val="6"
      name="QualityPerformanceSelection"
      show_text="false"
      top_delta="-2"
@@ -120,12 +147,12 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText2"
+     name="ShadersPrefText3"
      top_delta="0"
      width="80">
         Mid
     </text>
-    <text
+  <text
      type="string"
      length="1"
      follows="left|top"
@@ -136,8 +163,8 @@
      name="ShadersPrefText3"
      top_delta="0"
      width="80">
-        High
-    </text>
+      High
+  </text>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From b8bd81f7f362f47305d57246159ed14d187163c9 Mon Sep 17 00:00:00 2001
From: Maestro Linden <maestro@lindenlab.com>
Date: Thu, 13 Dec 2012 19:59:47 +0000
Subject: MAINT-2109  Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions
 for LSL scripts and script information floater. Reviewed by Andrew.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..0f4424a7f9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2508,6 +2508,8 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string>
 	<string name="ATTACH_HUD_BOTTOM">HUD Bottom</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
+	<string name="ATTACH_NECK">Neck</string>
+	<string name="ATTACH_AVATAR_CENTER">Avatar Center</string>
 
 	<!-- script editor -->
 	<string name="CursorPos">Line [LINE], Column [COLUMN]</string>
-- 
cgit v1.2.3


From 179ab5c7353150ebaeac6e32fa55f96670c3c256 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 13 Dec 2012 15:54:49 -0800
Subject: CHUI-595, CHU-554: Updating the people panel to new specs.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 8e143623ab..5f475baa93 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -7,7 +7,7 @@
   height="570"
   help_topic="sidebar_people"
   min_height="440"
-  min_width="390"
+  min_width="260"
   layout="topleft"
   name="floater_people"
   save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7433ad828d..7ce2627be9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -229,7 +229,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          bg_opaque_color="DkGray"
          bottom="-1"
          follows="all"
-         label="MY FRIENDS"
+         label="FRIENDS"
          layout="topleft"
          left="0"
          help_topic="people_friends_tab"
@@ -385,7 +385,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          bg_opaque_color="DkGray"
          bottom="-1"
          follows="all"
-         label="MY GROUPS"
+         label="GROUPS"
          layout="topleft"
          left="0"
          help_topic="people_groups_tab"
-- 
cgit v1.2.3


From bede028c51a30d2c0d3b3077e2b6d0ffdaf769da Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 14 Dec 2012 14:17:53 -0800
Subject: CHUI-595: Updating the people panel according to specs.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 5f475baa93..fe3aeeb038 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -14,13 +14,13 @@
   single_instance="true"
   reuse_instance="true"
   title="PEOPLE"
-  width="390">
+  width="370">
     <panel_container
       default_panel_name="panel_people"
       follows="all"
       height="570"
       name="main_panel"
-      width="390">
+      width="370">
       <panel
         class="panel_people"
         name="panel_people"
-- 
cgit v1.2.3


From 56b23a8727af34d950e217affa784d322b737cc3 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 14 Dec 2012 14:25:49 -0800
Subject: CHUI-554: Updating the people panel according to specs.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index fe3aeeb038..701233ba4a 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -6,7 +6,7 @@
   can_resize="true"
   height="570"
   help_topic="sidebar_people"
-  min_height="440"
+  min_height="220"
   min_width="260"
   layout="topleft"
   name="floater_people"
-- 
cgit v1.2.3


From 68b61bdec620014f30d6e9c63726d96fa7f4382a Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 14 Dec 2012 16:01:14 -0800
Subject: CHUI-520: Now when have a P2P conversation torn off a voice indicator
 icon will be displayed allowing the user to adjust the voice volume when
 clicked. Also did a code cleanup on conversationview.h/cpp which was showing
 the speaking indicator icon too soon when joining another voice session. This
 was due to calling switchIndicator(..) directly inside
 ::onCurrentVoiceSessionChanged. The proper solution is to wait for
 SpeeakingIndicatorManager::switchSpeakerIndicators() call switchIndicators().

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index faf54774f6..e4b127b7b9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -106,6 +106,18 @@
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
                  width="31"/>
+              <output_monitor
+                  auto_update="true"
+                  follows="top|left"
+                  draw_border="false"
+                  height="16"
+                  layout="topleft"
+                  top="10"
+                  left_pad="10"
+                  mouse_opaque="true"
+                  name="speaking_indicator"
+                  visible="false"
+                  width="20" />       
              <button
                  follows="right|top"
                  height="25"
-- 
cgit v1.2.3


From 01bdfb3ecb88ce71078494274a8d7835d181c50e Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Sat, 15 Dec 2012 21:28:38 +0200
Subject: CHUI-591 FIXED Issues with resizing conversations floater

---
 .../skins/default/xui/en/floater_im_container.xml  | 31 ++++++++++------------
 1 file changed, 14 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 1128b8fef6..37a3b9ac59 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -15,7 +15,7 @@
  title="CONVERSATIONS"
  bottom="-50"
  right="-5"
- width="450">
+ width="500">
     <string
      name="collapse_icon"
      value="Conv_toolbar_collapse"/>
@@ -24,22 +24,21 @@
      value="Conv_toolbar_expand"/>
     <layout_stack
      animate="true" 
+     bottom="-1"
      follows="all"
-     height="230"
      layout="topleft"
      left="0"
      name="conversations_stack"
      orientation="horizontal"
-     top="0"
-     width="450">
+     right="-1"
+     top="0">
         <layout_panel
          auto_resize="false"
          user_resize="true"        
-         height="430"
          name="conversations_layout_panel"
          min_dim="38"
-         width="268"
-         expanded_min_dim="120">
+         width="225"
+         expanded_min_dim="200">
             <layout_stack
              animate="false" 
              follows="left|top|right"
@@ -48,8 +47,8 @@
              left="0"
              name="conversations_pane_buttons_stack"
              orientation="horizontal"
-             top="0"
-             width="268">
+             right="-1"
+             top="0">
                 <layout_panel
                  auto_resize="true"
                  height="35"
@@ -123,32 +122,30 @@
              top_pad="0"
              left="5"
              height="390"
-             width="263"/>
+             right="-1"/>
         </layout_panel>
         <layout_panel
          auto_resize="true"
          user_resize="true"
-         height="430"
          name="messages_layout_panel"
-         width="412"
          expanded_min_dim="225">
             <panel_container
+             bottom="-1"
              follows="all"
-             height="430"
              layout="topleft"
              left="0"
              name="im_box_tab_container"
-             top="0"
-             width="412">
+             right="-1"
+             top="0">
              <panel
+               bottom="-1"
                follows="all"
                layout="topleft"
                name="stub_panel"
                opaque="true"
                top_pad="0"
                left="0"
-               height="430"
-               width="412">
+               right="-1">
                  <button
                  follows="right|top"
                  height="25"
-- 
cgit v1.2.3


From 6b165ce2ade6db7d5e6cb23e039e4949dc71e617 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 18 Dec 2012 15:09:50 +0200
Subject: CHUI-562 FIXED Gear button is added for p2p torn-off floater.

---
 .../skins/default/xui/en/floater_im_session.xml    | 15 ++++
 .../skins/default/xui/en/menu_im_conversation.xml  | 94 ++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_im_conversation.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index e4b127b7b9..4dbd52d05e 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -79,6 +79,21 @@
                  tool_tip="View/sort options"
                  top="5"
                  width="31" />
+             <menu_button
+				 menu_filename="menu_im_conversation.xml"
+				 follows="top|left"
+				 height="25"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_overlay="OptionsMenu_Off"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 layout="topleft"
+			 	 top="5"
+			 	 left_pad="4"
+				 name="gear_btn"
+				 visible="false"
+				 tool_tip="Actions on selected person"
+				 width="31"/>
              <button
                  enabled="false"
                  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
new file mode 100644
index 0000000000..8882d0a7d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Gear Menu">
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <on_click function="Avatar.GearDoToSelected" parameter="view_profile" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_view_profile" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="Add Friend">
+        <on_click function="Avatar.GearDoToSelected" parameter="add_friend" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click function="Avatar.GearDoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Offer teleport"
+     layout="topleft"
+     name="offer_teleport">
+        <on_click function="Avatar.GearDoToSelected" parameter="offer_teleport"/>
+        <on_enable function="Avatar.EnableGearItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="invite_to_group">
+        <on_click function="Avatar.GearDoToSelected" parameter="invite_to_group" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_invite" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="View Icons Separator" />
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="chat_history">
+        <on_click function="Avatar.GearDoToSelected" parameter="chat_history"/>
+        <on_enable function="Avatar.EnableGearItem" parameter="can_chat_history"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="map">
+        <on_click function="Avatar.GearDoToSelected" parameter="map" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <on_click function="Avatar.GearDoToSelected" parameter="share" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <on_click function="Avatar.GearDoToSelected" parameter="pay" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_check
+     label="Block Voice"
+     layout="topleft"
+     name="Block/Unblock">
+        <on_check function="Avatar.CheckGearItem" parameter="is_blocked" />
+        <on_click function="Avatar.GearDoToSelected" parameter="block_unblock" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="MuteText">
+        <on_check function="Avatar.CheckGearItem" parameter="is_muted" />
+        <on_click function="Avatar.GearDoToSelected" parameter="mute_unmute" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft"/>
+</toggleable_menu>
+
-- 
cgit v1.2.3


From e64c8fdc145c6ae2727173d310a732a471aaf569 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 18 Dec 2012 18:57:13 +0200
Subject: CHUI-583 FIXED Menu items with appropriate links are added

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 53 +++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3e7329c0b5..00424e97f6 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1267,7 +1267,58 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>-->
-
+		<menu_item_separator/>
+		
+		<menu_item_call
+             label="User’s guide"
+             name="User’s guide">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Knowledge Base"
+             name="Knowledge Base">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://community.secondlife.com/t5/tkb/communitypage"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Wiki"
+             name="Wiki">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://wiki.secondlife.com"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Community Forums"
+             name="Community Forums">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/>
+        </menu_item_call>         
+        <menu_item_call
+             label="Support portal"
+             name="Support portal">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="https://support.secondlife.com/"/>         
+        </menu_item_call>
+        <menu_item_separator/>
+        <menu_item_call
+             label="[SECOND_LIFE] News"
+             name="Second Life News">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>  
+        </menu_item_call>
+        <menu_item_call
+             label="[SECOND_LIFE] Blogs"
+             name="Second Life Blogs">
+             <menu_item_call.on_click
+                 function="Advanced.WebBrowserTest"
+                 parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
+        </menu_item_call>
         <menu_item_separator/>
 
         <menu_item_call
-- 
cgit v1.2.3


From 610b25ad3a070c984cb303250428a4a9b8301c6f Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 18 Dec 2012 18:33:16 +0200
Subject: CHUI-591 FIXED Issues with resizing conversations floater

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 37a3b9ac59..1837100c28 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -38,7 +38,7 @@
          name="conversations_layout_panel"
          min_dim="38"
          width="225"
-         expanded_min_dim="200">
+         expanded_min_dim="156">
             <layout_stack
              animate="false" 
              follows="left|top|right"
@@ -108,7 +108,7 @@
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
                      top="5"
-                     left="5"
+                     left="1"
                      name="expand_collapse_btn"
                      tool_tip="Collapse/Expand this list"
                      width="31" />
@@ -128,7 +128,7 @@
          auto_resize="true"
          user_resize="true"
          name="messages_layout_panel"
-         expanded_min_dim="225">
+         expanded_min_dim="186">
             <panel_container
              bottom="-1"
              follows="all"
-- 
cgit v1.2.3


From fc89db6ca4f0cc41e9b20e52a2735ff1db143314 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 19 Dec 2012 00:09:47 +0200
Subject: CHUI-591 FIXED Issues with resizing conversations floater: small
 correction of size in right panel of conversation floater;

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 1837100c28..3475c7da33 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -128,7 +128,7 @@
          auto_resize="true"
          user_resize="true"
          name="messages_layout_panel"
-         expanded_min_dim="186">
+         expanded_min_dim="222">
             <panel_container
              bottom="-1"
              follows="all"
-- 
cgit v1.2.3


From da59ef8013801eac3695cea0ae8c1097275b6832 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 18 Dec 2012 19:22:21 -0800
Subject: Removing copy from the DoNotDisturbModeSet notification as we are no
 longer auto deleting inventory offers.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 94307d2f93..35ce787847 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3696,7 +3696,6 @@ Do Not Disturb is on.  You will not be notified of incoming communications.
 - Other residents will receive your Do Not Disturb response (set in Preferences &gt; General).
 - Teleportation offers will be declined.
 - Voice calls will be rejected.
-- Inventory offers will go to your Trash.
     <usetemplate
      ignoretext="I change my status to Do Not Disturb mode"
      name="okignore"
-- 
cgit v1.2.3


From 22c2fff4ba4198b8dca8367ae3f03d189e815770 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 14 Dec 2012 19:56:05 +0200
Subject: CHUI-566 Flashing and color on Conversations FUI button and
 conversation line item

---
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 053b213ef4..0ace37a5dc 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,9 +30,9 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="3"
-                        button_flash_rate="0.25"
-                        flash_color="EmphasisColor"/>
+                        button_flash_count="4"
+                        button_flash_rate="0.5"
+                        flash_color="BeaconColor"/>
   <button_icon pad_left="10"
                pad_right="10"
                image_bottom_pad="10"
@@ -51,7 +51,7 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="3"
-               button_flash_rate="0.25"
-               flash_color="EmphasisColor"/>
+               button_flash_count="4"
+               button_flash_rate="0.5"
+               flash_color="BeaconColor"/>
 </toolbar>
-- 
cgit v1.2.3


From 18402904144f400a81cb289138fce0050a083560 Mon Sep 17 00:00:00 2001
From: Maestro Linden <maestro@lindenlab.com>
Date: Fri, 14 Dec 2012 19:46:24 +0000
Subject: MAINT-2121 Fixed case where changing other parcel option disables
 'Show place in search'.  Reviewed by Simon.

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

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

diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 89aef57cca..0eeccbeac5 100644
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -70,8 +70,8 @@
 		     longdescription="Toggle &apos;Show Place in Search&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
 		     name="land find places" value="17" />
 		<action
-		     description="Change parcel name, description, and &apos;Show Place in Search&apos; settings"
-		     longdescription="Change parcel name, description, and &apos;Show Place in Search&apos; settings. This is done in About Land &gt; Options tab."
+		     description="Change parcel name, description, and &apos;Moderate Content&apos; settings"
+		     longdescription="Change parcel name, description, and &apos;Moderate Content&apos; settings. This is done in About Land &gt; Options tab."
 		     name="land change identity" value="18" />
 		<action description="Set landing point and set teleport routing"
 		     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
-- 
cgit v1.2.3


From cc900b732dd1af2790248485a270197a4006e0f7 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 19 Dec 2012 02:44:48 +0200
Subject: CHUI-592 FIXED Unread notifications are not being saved in
 notification chiclet

---
 .../xui/da/menu_notification_well_button.xml       |  4 ++
 .../xui/de/menu_notification_well_button.xml       |  4 ++
 .../xui/en/menu_notification_well_button.xml       | 16 ++++++++
 .../skins/default/xui/en/panel_chiclet_bar.xml     | 44 ++++++++++++++++++++++
 .../xui/es/menu_notification_well_button.xml       |  4 ++
 .../xui/fr/menu_notification_well_button.xml       |  4 ++
 .../xui/it/menu_notification_well_button.xml       |  4 ++
 .../xui/ja/menu_notification_well_button.xml       |  4 ++
 .../xui/pl/menu_notification_well_button.xml       |  4 ++
 .../xui/pt/menu_notification_well_button.xml       |  4 ++
 .../xui/ru/menu_notification_well_button.xml       |  4 ++
 .../xui/tr/menu_notification_well_button.xml       |  4 ++
 .../xui/zh/menu_notification_well_button.xml       |  4 ++
 13 files changed, 104 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/da/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_notification_well_button.xml

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

diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
new file mode 100644
index 0000000000..40b35b5fdd
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
new file mode 100644
index 0000000000..0f2784f160
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Alle schließen" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
new file mode 100644
index 0000000000..263ac40f4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Notification Well Button Context Menu">
+    <menu_item_call
+     label="Close All"
+     layout="topleft"
+     name="Close All">
+        <menu_item_call.on_click
+         function="NotificationWellChicletMenu.Action"
+         parameter="close all" />
+        <menu_item_call.on_enable
+         function="NotificationWellChicletMenu.EnableItem"
+         parameter="can close all" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index 390047d493..fc321fdd23 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -77,5 +77,49 @@
                  width="12" />
       </chiclet_panel>
     </layout_panel>
+    <layout_panel auto_resize="false"
+                      width="4"
+                      min_width="4"/>
+    <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="37"
+         name="notification_well_panel"
+         top="0"
+         width="37">
+      <chiclet_notification
+             follows="right"
+             height="23"
+             layout="topleft"
+             left="0"
+             max_displayed_count="99"
+             name="notification_well"
+             top="5"
+             width="35">
+        <button
+                 auto_resize="false"
+                 bottom_pad="3"
+                 follows="right"
+                 halign="center"
+                 height="23"
+                 image_overlay="Notices_Unread"
+                 image_overlay_alignment="center"
+                 image_pressed="WellButton_Lit"
+                 image_pressed_selected="WellButton_Lit_Selected"
+                 image_selected="PushButton_Press"
+                 label_color="Black"
+                 left="0"
+                 name="Unread"
+                 tool_tip="Notifications"
+                 width="34">
+          <init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="notification_well_window" />
+        </button>
+      </chiclet_notification>
+    </layout_panel>
   </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
new file mode 100644
index 0000000000..0562d35be7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Cerrar todo" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
new file mode 100644
index 0000000000..323bfdbf16
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Tout fermer" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
new file mode 100644
index 0000000000..8c82e30f0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Chiudi tutto" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
new file mode 100644
index 0000000000..913bae8958
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="すべて閉じる" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
new file mode 100644
index 0000000000..bd3d42f9b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Zamknij" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
new file mode 100644
index 0000000000..43ad4134ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Fechar tudo" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
new file mode 100644
index 0000000000..4d067e232a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Закрыть все" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
new file mode 100644
index 0000000000..39c66268f5
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Tümünü Kapat" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
new file mode 100644
index 0000000000..b629f73584
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="全部關閉" name="Close All"/>
+</context_menu>
-- 
cgit v1.2.3


From ca4c5d3bcb18afefc181bdc164d1c338abef7488 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 19 Dec 2012 11:28:38 -0800
Subject: Switching some notification types from "offer" to be "notify" as the
 notifications were not offers.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 35ce787847..05798da8e2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6583,7 +6583,7 @@ However, this region contains content accessible to adults only.
    log_to_im="true"
    log_to_chat="false"
    show_toast="false"
-   type="offer">
+   type="notify">
 	Teleport offer sent to [TO_NAME]
   </notification>
 
@@ -6636,7 +6636,7 @@ However, this region contains content accessible to adults only.
    name="FriendshipOffered"
    log_to_im="true"   
    show_toast="false"   
-   type="offer">
+   type="notify">
     <tag>friendship</tag>
 	You have offered friendship to [TO_NAME]
   </notification>
@@ -6666,7 +6666,7 @@ However, this region contains content accessible to adults only.
    icon="notify.tga"
    name="FriendshipAccepted"
    log_to_im="true"   
-   type="offer">
+   type="notify">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; accepted your friendship offer.
   </notification>
@@ -6686,7 +6686,7 @@ However, this region contains content accessible to adults only.
    name="FriendshipAcceptedByMe"
    log_to_im="true"   
    show_toast="false"
-   type="offer">
+   type="notify">
     <tag>friendship</tag>
 Friendship offer accepted.
   </notification>
@@ -6696,7 +6696,7 @@ Friendship offer accepted.
    name="FriendshipDeclinedByMe"
    log_to_im="true"   
    show_toast="false"   
-   type="offer">
+   type="notify">
     <tag>friendship</tag>
 Friendship offer declined.
   </notification>
-- 
cgit v1.2.3


From 95380b0aaa635c18c03801048559ba811640bc02 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 20 Dec 2012 22:37:04 +0200
Subject: CHUI-513 FIXED Revise initial conversation floater size

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 7 ++-----
 indra/newview/skins/default/xui/en/floater_im_session.xml   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 3475c7da33..cbf1830093 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -3,9 +3,8 @@
  can_close="true"  
  can_minimize="true"
  can_resize="true"
- height="230"
+ height="210"
  layout="topleft"
- min_height="50"
  name="floater_im_box"
  help_topic="floater_im_box"
  save_rect="true"
@@ -15,7 +14,7 @@
  title="CONVERSATIONS"
  bottom="-50"
  right="-5"
- width="500">
+ width="450">
     <string
      name="collapse_icon"
      value="Conv_toolbar_collapse"/>
@@ -37,7 +36,6 @@
          user_resize="true"        
          name="conversations_layout_panel"
          min_dim="38"
-         width="225"
          expanded_min_dim="156">
             <layout_stack
              animate="false" 
@@ -121,7 +119,6 @@
              opaque="true"
              top_pad="0"
              left="5"
-             height="390"
              right="-1"/>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 4dbd52d05e..9e2132dc3b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -206,7 +206,7 @@
        auto_resize="true"
        visible="true"
        name="left_part_holder"
-       min_width="225">
+       min_width="221">
         <panel
          name="trnsAndChat_panel"
          follows="all"
-- 
cgit v1.2.3


From 090636f107a2d3ba3438a6690f36eac3ec257314 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 20 Dec 2012 18:36:01 -0800
Subject: CHUI-429 : Fixed! Add a flag to filter multi/single selection
 situations in menu building. Implement in conversation contextual menu.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index e0edf384d6..46c6e19fa5 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -75,6 +75,13 @@
         <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
         <on_enable function="Avatar.EnableItem" parameter="can_delete" />
     </menu_item_call>	
+    <menu_item_call
+     label="Remove friends"
+     layout="topleft"
+     name="remove_friends">
+        <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableItem" parameter="can_delete" />
+    </menu_item_call>	
     <menu_item_call
      label="Invite to group..."
      layout="topleft"
-- 
cgit v1.2.3


From 6df0377d1dd810cc1656c6c2664af2c7c87705fc Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 21 Dec 2012 20:11:01 +0200
Subject: CHUI-622 FIXED Default size of conversation log floater seems large

---
 .../default/xui/en/floater_conversation_log.xml    | 163 ++++++++++-----------
 1 file changed, 80 insertions(+), 83 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index c9c52e5ce5..960db137b3 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -1,91 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 
 <floater
-  can_resize="true"
-  positioning="cascading"
-  height="400"
-  min_height="100"
-  min_width="390"
-  layout="topleft"
-  name="floater_conversation_log"
-  save_rect="true"
-  single_instance="true"
-  reuse_instance="true"
-  title="CONVERSATION LOG"
-  width="450">
-  
+ can_resize="true"
+ positioning="cascading"
+ height="200"
+ min_height="100"
+ min_width="200"
+ layout="topleft"
+ name="floater_conversation_log"
+ save_rect="true"
+ single_instance="true"
+ reuse_instance="true"
+ title="CONVERSATION LOG"
+ width="300">
   <string name="logging_calls_disabled">
      Conversations are not being logged. To log conversations in the future, select "Save IM logs on my computer" under Preferences > Privacy.
   </string>
-  
-	<panel
-      follows="left|top|right"
-      height="27"
-      layout="topleft"
-      left="0"
-      name="buttons_panel"
-      top="0">
-        <filter_editor
-          follows="left|top|right"
-          height="23"
-          layout="topleft"
-          left="8"
-          label="Filter People"
-          max_length_chars="300"
-          name="people_filter_input"
-          text_color="Black"
-          text_pad_left="10"
-          top="4"
-          width="364" />
-        <menu_button
-          follows="right"
-          height="25"
-          image_hover_unselected="Toolbar_Middle_Over"
-          image_overlay="Conv_toolbar_sort"
-          image_selected="Toolbar_Middle_Selected"
-          image_unselected="Toolbar_Middle_Off"
-          layout="topleft"
-          left_pad="5"
-          menu_filename="menu_conversation_log_view.xml"
-          menu_position="bottomleft"
-          name="conversation_view_btn"
-          tool_tip="View/sort options"
-          top="3"
-          width="31" />
-        <menu_button
-          follows="right"
-          height="25"
-          image_hover_unselected="Toolbar_Middle_Over"
-          image_overlay="OptionsMenu_Off"
-          image_selected="Toolbar_Middle_Selected"
-          image_unselected="Toolbar_Middle_Off"
-          layout="topleft"
-          left_pad="2"
-          name="conversations_gear_btn"
-          tool_tip="Actions on selected person or group"
-          top="3"
-          width="31" />
-    </panel>
-    <panel
-      follows="all"
-      height="370"
-      layout="topleft"
-      left="5"
-      name="buttons_panel"
-      right="-5"
-      top_pad="5">
+  <panel
+   bottom="0"
+   follows="left|top|right"
+   height="32"
+   left="0"
+   name="buttons_panel"
+   right="0"
+   top="0">
+    <filter_editor
+     follows="left|top|right"
+     height="23"
+     layout="topleft"
+     left="8"
+     label="Filter People"
+     max_length_chars="300"
+     name="people_filter_input"
+     text_color="Black"
+     text_pad_left="10"
+     top="4"
+     width="204" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="Conv_toolbar_sort"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="8"
+     menu_filename="menu_conversation_log_view.xml"
+     menu_position="bottomleft"
+     name="conversation_view_btn"
+     tool_tip="View/sort options"
+     top="3"
+     width="31" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="OptionsMenu_Off"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="8"
+     name="conversations_gear_btn"
+     tool_tip="Actions on selected person or group"
+     top="3"
+     width="31" />
+  </panel>
+  <panel
+   bottom="-1"
+   follows="all"
+   left="0"
+   name="log_panel"
+   right="-1"
+   top="32">
     <conversation_log_list
-      opaque="true"
-      allow_select="true"
-      follows="all"
-      height="360"
-      layout="topleft"
-      left="3"
-      keep_selection_visible_on_reshape="true"
-      item_pad="2"
-      multi_select="false"
-      name="conversation_log_list"
-      right="-3"
-      top="5" />
-    </panel>
+     allow_select="true"
+     bottom="-8"
+     opaque="true"
+     follows="all"
+     left="8"
+     keep_selection_visible_on_reshape="true"
+     item_pad="2"
+     multi_select="false"
+     name="conversation_log_list"
+     right="-8"
+     top="0" />
+  </panel>
 </floater>
-- 
cgit v1.2.3


From 923262f154748eea5ce1eda37df1b9df1eaf0f43 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Mon, 24 Dec 2012 14:20:25 +0200
Subject: CHUI-583 FIXED Link will be opened in external browser if this
 preference is set.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 00424e97f6..76de81559b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1273,35 +1273,35 @@
              label="User’s guide"
              name="User’s guide">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
         </menu_item_call>
         <menu_item_call
              label="Knowledge Base"
              name="Knowledge Base">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="http://community.secondlife.com/t5/tkb/communitypage"/>
         </menu_item_call>
         <menu_item_call
              label="Wiki"
              name="Wiki">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="http://wiki.secondlife.com"/>
         </menu_item_call>
         <menu_item_call
              label="Community Forums"
              name="Community Forums">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/>
         </menu_item_call>         
         <menu_item_call
              label="Support portal"
              name="Support portal">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="https://support.secondlife.com/"/>         
         </menu_item_call>
         <menu_item_separator/>
@@ -1309,14 +1309,14 @@
              label="[SECOND_LIFE] News"
              name="Second Life News">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>  
         </menu_item_call>
         <menu_item_call
              label="[SECOND_LIFE] Blogs"
              name="Second Life Blogs">
              <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
+                 function="Advanced.ShowURL"
                  parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
         </menu_item_call>
         <menu_item_separator/>
-- 
cgit v1.2.3


From 32944ef9e41a96950aa645a016c8f2c6bf71a351 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Mon, 24 Dec 2012 19:01:27 +0200
Subject: CHUI-627 FIXED Unnecessary attributes are deleted  in xml

---
 indra/newview/skins/default/xui/en/floater_conversation_log.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 960db137b3..cf61348a66 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -17,12 +17,10 @@
      Conversations are not being logged. To log conversations in the future, select "Save IM logs on my computer" under Preferences > Privacy.
   </string>
   <panel
-   bottom="0"
    follows="left|top|right"
    height="32"
    left="0"
    name="buttons_panel"
-   right="0"
    top="0">
     <filter_editor
      follows="left|top|right"
-- 
cgit v1.2.3


From 51747dc6bfcdf0c3a9926f2b28ff30f0686623b3 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 25 Dec 2012 21:16:30 +0200
Subject: CHUI-623 FIXED No vertical scrollbar in conversation list

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index cbf1830093..e7638fe669 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -113,11 +113,12 @@
                 </layout_panel>
             </layout_stack>
             <panel
+             bottom="-5"
              follows="all"
              layout="topleft"
              name="conversations_list_panel"
              opaque="true"
-             top_pad="0"
+             top="35"
              left="5"
              right="-1"/>
         </layout_panel>
@@ -127,7 +128,7 @@
          name="messages_layout_panel"
          expanded_min_dim="222">
             <panel_container
-             bottom="-1"
+             bottom="-5"
              follows="all"
              layout="topleft"
              left="0"
-- 
cgit v1.2.3


From 7e8d336749b42ce134a67dfe1f1990644f1b263a Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Fri, 28 Dec 2012 15:28:19 +0200
Subject: CHUI-639 FIXED Min. width is increased to avoid overlapping

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index cf61348a66..256e03c4d7 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -5,7 +5,7 @@
  positioning="cascading"
  height="200"
  min_height="100"
- min_width="200"
+ min_width="230"
  layout="topleft"
  name="floater_conversation_log"
  save_rect="true"
-- 
cgit v1.2.3


From a25e6eb733bb8f6a0e9f8de1094155f685c6216d Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 28 Dec 2012 16:11:05 +0200
Subject: CHUI-453 FIXED Tooltip on chevron in torn-off conversation is
 incorrect: implemented suitable tool-tips; fixed a small separate bug
 ("tooltip_to_separate_window"/"tooltip_to_main_window" for Tear-Off Button:
 was shown reverse)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 9e2132dc3b..8f0574177f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -49,6 +49,15 @@
   <floater.string
      name="end_call_button_tooltip"
      value="Close voice connection"/>
+   <floater.string
+     name="expcol_button_not_tearoff_tooltip"
+     value="Collapse this pane"/>
+   <floater.string
+     name="expcol_button_tearoff_and_expanded_tooltip"
+     value="Collapse participant list"/>
+   <floater.string
+     name="expcol_button_tearoff_and_collapsed_tooltip"
+     value="Expand participant list"/>
     <view
         follows="all"
         layout="topleft"
-- 
cgit v1.2.3


From b1ba208e7fcb8dbaa2c47b70fe580094982e36dd Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Sat, 5 Jan 2013 00:09:36 +0200
Subject: CHUI-643 W.I.P. Collapsed conversations floater has huge right
 padding: corrected of a imcontainer's resize calculating

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e7638fe669..951665552f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -14,7 +14,8 @@
  title="CONVERSATIONS"
  bottom="-50"
  right="-5"
- width="450">
+ width="450"
+ min_width="38">
     <string
      name="collapse_icon"
      value="Conv_toolbar_collapse"/>
-- 
cgit v1.2.3


From 1f4f028044eacfd7f5df5fb5045855658e749d4b Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 7 Jan 2013 17:06:28 -0800
Subject: FIX INTL-110 fix corrupted chinese character in translation

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

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

diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 3f17324006..3a266abc64 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
      For example, the strings used in avatar chat bubbles, and strings
@@ -1982,7 +1982,7 @@ http://secondlife.com/viewer-access-faq
 		新腳本
 	</string>
 	<string name="BusyModeResponseDefault">
-		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對���的 IM 面板上供稍後查閱。
+		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
 	</string>
 	<string name="MuteByName">
 		（按名稱）
-- 
cgit v1.2.3


From b0d39758184b93a06f5f5f972f168af2d86dcdd2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 7 Jan 2013 17:10:37 -0800
Subject: FIX INTL-110 remove utf8 BOM

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

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

diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 3a266abc64..7e17ed6864 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
      For example, the strings used in avatar chat bubbles, and strings
-- 
cgit v1.2.3


From 3cf2d8e9eac215024bc216958b0920e61aa25de1 Mon Sep 17 00:00:00 2001
From: maximbproductengine <maximbproductengine@lindenlab.com>
Date: Wed, 9 Jan 2013 10:41:09 +0200
Subject: CHUI-665 (Change "Open conversation log" to "Conversation log..." in
 communication floater view/sort menu)

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 33d7bd7c01..2f2bafb95d 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -76,7 +76,7 @@
          parameter="privacy_preferences" />
     </menu_item_call>
     <menu_item_check
-         label="Open conversation log"
+         label="Conversation log..."
          name="Conversation"
          visible="true">
         <menu_item_check.on_check
-- 
cgit v1.2.3


From df5378cf38b0e8325ae41be8af772e30cb815dd4 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 8 Jan 2013 19:59:27 +0200
Subject: CHUI-611 Fixed! Text in torn off message panel not wrapping correctly
 with size of conversation panel

---
 .../skins/default/xui/en/floater_im_container.xml  | 30 ++++++----------------
 1 file changed, 8 insertions(+), 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 951665552f..12c1676127 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -161,32 +161,18 @@
                  <text
                    type="string"
                    clip_partial="false"
-                   follows="left|top"
+                   follows="left|top|right"
                    layout="topleft"
-                   left="20"
-                   right="-20"
-                   name="stub_textbox_1"
-                   top="30"
-                   height="20"
-                   valign="center"
-                   wrap="true">
-                   This conversation is in a separate window.
-                 </text>
-                 <text
-                   type="string"
-                   clip_partial="false"
-                   follows="left|top"
-                   layout="topleft"
-                   left="20"
-                   right="-20"
-                   name="stub_textbox_2"
-                   top="60"
-                   height="20"
+                   left="15"
+                   right="-15"
+                   name="stub_textbox"
+                   top="25"
+                   height="40"
                    valign="center"
                    parse_urls="true"
                    wrap="true">
-                     [secondlife:/// Bring it back.]
-                </text>
+                   This conversation is in a separate window.   [secondlife:/// Bring it back.]
+                 </text>
              </panel>
             </panel_container>
         </layout_panel>
-- 
cgit v1.2.3


From f4663e098c1f338259b46085188be19f8fad7543 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Thu, 10 Jan 2013 18:05:39 -0600
Subject: New controls for editing media.

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 228 +++++++++++++++++----
 1 file changed, 184 insertions(+), 44 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 26b2d83351..21cbf9673d 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -155,36 +155,36 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             name="label shininess"
              left_pad="10"
+             name="label alphamode"
              text_readonly_color="LabelDisabledColor"
-             top_delta="6"
+             top_delta="0"
              width="90">
-                Shininess
+                Alpha mode
             </text>
             <combo_box
              height="23"
              layout="topleft"
-             left_pad="10"
-             name="combobox shininess"
-             top_delta="-6"
-             width="90">
+             left_delta="0"
+             name="combobox alphamode"
+             top_pad="4"
+             width="120">
                 <combo_box.item
                  label="None"
                  name="None"
                  value="None" />
                 <combo_box.item
-                 label="Low"
-                 name="Low"
-                 value="Low" />
+                 label="Alpha blending"
+                 name="Alpha blending"
+                 value="Alpha blending" />
                 <combo_box.item
-                 label="Medium"
-                 name="Medium"
-                 value="Medium" />
+                 label="Alpha masking"
+                 name="Alpha masking"
+                 value="Alpha masking" />
                 <combo_box.item
-                 label="High"
-                 name="High"
-                 value="High" />
+                 label="Emissive mask"
+                 name="Emissive mask"
+                 value="Emissive mask" />
             </combo_box>
             <text
              type="string"
@@ -192,7 +192,43 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="-100"
+             left_delta="0"
+             name="label maskcutoff"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="4"
+             width="90">
+                Mask cutoff
+            </text>
+            <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_pad="4"
+             left_delta="0"
+             name="maskcutoff"
+             width="80" />
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="locked_image.j2c"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="bumpytexture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-55"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="10"
              name="label bumpiness"
              text_readonly_color="LabelDisabledColor"
              top_delta="0"
@@ -278,13 +314,142 @@
                  label="weave"
                  name="weave"
                  value="weave" />
+                <combo_box.item
+                 label="Use texture"
+                 name="Use texture"
+                 value="Use texture" />
+            </combo_box>
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="locked_image.j2c"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="shinytexture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-14"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label shininess"
+             left_pad="10"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="6"
+             width="90">
+                Shininess
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             name="combobox shininess"
+             top_delta="-6"
+             width="90">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Low"
+                 name="Low"
+                 value="Low" />
+                <combo_box.item
+                 label="Medium"
+                 name="Medium"
+                 value="Medium" />
+                <combo_box.item
+                 label="High"
+                 name="High"
+                 value="High" />
+                <combo_box.item
+                 label="Use texture"
+                 name="Use texture"
+                 value="Use texture" />
             </combo_box>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-100"
+             name="label glossiness"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Glossiness
+            </text>
+            <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_delta="-4"
+             left_pad="10"
+             name="glossiness"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-126"
+             name="label environment"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Environment
+            </text>
+            <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_delta="-4"
+             left_pad="10"
+             name="environment"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-126"
+             name="label shinycolor"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Color
+            </text>
+            <!-- label is blank because control places it below the box -->
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="45"
+             label=""
+             layout="topleft"
+             left_pad="10"
+             name="shinycolorswatch"
+             tool_tip="Click to open color picker"
+             top_delta="-4"
+             width="64" />
             <text
 			 follows="left|top|right"
 			 height="9"
 			 layout="topleft"
 			 left="10"
-			 top_delta="-8"
+			 top_delta="-50"
              use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
@@ -370,14 +535,6 @@
              name="TexScaleU"
              top_pad="5"
              width="265" />
-            <!-- <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip s"
-             top_delta="0"
-             width="70" /> -->
             <spinner
              follows="left|top"
              height="19"
@@ -390,14 +547,6 @@
              max_val="100"
              name="TexScaleV"
              width="265" />
-            <!-- <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip t"
-             top_delta="0"
-             width="70" /> -->
             <spinner
              decimal_digits="1"
              follows="left|top"
@@ -411,16 +560,7 @@
              min_val="0.1"
              name="rptctrl"
              width="265" />
-            <!-- <button
-             follows="left|top"
-             height="19"
-             label="Apply"
-             label_selected="Apply"
-             layout="topleft"
-             left_pad="5"
-             name="button apply"
-             width="75" /> -->
-            <spinner
+           <spinner
              decimal_digits="2"
              follows="left|top"
              height="19"
-- 
cgit v1.2.3


From 4b36a56110b3af7fbc8d3a07d9bbfbb9c2a83ae9 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 14 Jan 2013 17:33:45 -0800
Subject: sync with viewer-development

---
 .../skins/default/xui/en/floater_my_inventory.xml  |    2 +-
 .../newview/skins/default/xui/en/floater_tools.xml |    2 +-
 .../skins/default/xui/en/floater_ui_preview.xml    |    2 +-
 .../skins/default/xui/en/menu_inventory_add.xml    |    2 +-
 .../skins/default/xui/en/menu_outfit_gear.xml      |   14 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |   79 +-
 .../newview/skins/default/xui/en/notifications.xml | 3426 +++++++++++++++++++-
 .../skins/default/xui/en/panel_group_roles.xml     |    2 +-
 .../xui/en/panel_media_settings_general.xml        |    2 +-
 .../skins/default/xui/en/panel_script_ed.xml       |    1 +
 .../skins/default/xui/en/sidepanel_task_info.xml   |    4 +
 indra/newview/skins/default/xui/en/strings.xml     |    4 +-
 12 files changed, 3504 insertions(+), 36 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index ea44fd493e..178987962b 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
  height="570"
  help_topic="sidebar_inventory"
  min_width="333"
- min_height="560"
+ min_height="570"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5204efbf65..436e9f8fed 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2994,7 +2994,7 @@ even though the user gets a free copy.
                          use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
-			 width="280" />
+			 width="180" />
       <web_browser
         visible="false"
         enabled="false"
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 06d4327293..eb01294831 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -5,7 +5,7 @@
  height="640"
  layout="topleft"
  min_height="230"
- min_width="650"
+ min_width="750"
  name="gui_preview_tool"
  help_topic="gui_preview_tool"
  single_instance="true"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index e91f5af3d5..29720a680b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  left="0"
  mouse_opaque="false"
- can_tear_off="true"
+ can_tear_off="false"
  name="menu_inventory_add"
  visible="false">
             <menu
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index fc7272b904..3b8ace6308 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -194,6 +194,20 @@
             <!-- copied from menu_inventory_add.xml -->
 
     <menu_item_separator name="sepatator2" />
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Gear.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse">
+        <on_click
+         function="Gear.Collapse" />
+    </menu_item_call>
     <menu_item_call
      label="Rename Outfit"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 18932a32d0..caa36e7302 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -276,30 +276,39 @@
              parameter="gestures" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu_item_call
+        <menu_item_check
          label="Friends"
          name="My Friends"
          shortcut="control|shift|F">
-            <menu_item_call.on_click
+            <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="friends_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="friends_panel" />
-            </menu_item_call>
-        <menu_item_call
+            </menu_item_check>
+        <menu_item_check
          label="Groups"
          name="My Groups"
          shortcut="control|shift|G">
-            <menu_item_call.on_click
+         	<menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="groups_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
-        </menu_item_call>
-        <menu_item_call
+        </menu_item_check>
+        <menu_item_check
          label="Nearby people"
          name="Active Speakers"
          shortcut="control|shift|A">
-            <menu_item_call.on_click
+        	 <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="nearby_panel" />
+            <menu_item_check.on_click
               function="SideTray.PanelPeopleTab"
               parameter="nearby_panel" />
-        </menu_item_call>
+        </menu_item_check>
         <menu_item_call
          label="Block List"
          name="Block List">
@@ -875,14 +884,6 @@
 			<menu_item_call.on_enable
                function="Tools.EnableTakeCopy" />
           </menu_item_call>
-          <menu_item_call
-			 label="Save Back to My Inventory"
-			 name="Save Object Back to My Inventory">
-			<menu_item_call.on_click
-               function="Tools.SaveToInventory" />
-			<menu_item_call.on_enable
-               function="Tools.EnableSaveToInventory" />
-          </menu_item_call>
           <menu_item_call
 			 label="Save Back to Object Contents"
 			 name="Save Object Back to Object Contents">
@@ -3185,6 +3186,40 @@
                      parameter="AllowSelectAvatar" />
                 </menu_item_check>
             </menu>
+            <menu
+             create_jump_keys="true"
+             label="Animation Speed"
+             name="Animation Speed"
+             tear_off="true">
+                <menu_item_call
+                 label="All Animations 10% Faster"
+                 name="All Animations 10 Faster">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimTenFaster" />
+                </menu_item_call>
+                <menu_item_call
+                 label="All Animations 10% Slower"
+                 name="All Animations 10 Slower">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimTenSlower" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Reset All Animation Speed"
+                 name="Reset All Animation Speed">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimResetAll" />
+                </menu_item_call>
+				<menu_item_check
+				 label="Slow Motion Animations"
+				 name="Slow Motion Animations">
+					<menu_item_check.on_check
+					 function="CheckControl"
+					 parameter="SlowMotionAnimation" />
+					<menu_item_check.on_click
+					 function="ToggleControl"
+					 parameter="SlowMotionAnimation" />
+				</menu_item_check>
+            </menu>
             <menu_item_call
              label="Force Params to Default"
              name="Force Params to Default">
@@ -3201,16 +3236,6 @@
                  function="Advanced.ToggleAnimationInfo"
                  parameter="" />
             </menu_item_check>
-            <menu_item_check
-             label="Slow Motion Animations"
-             name="Slow Motion Animations">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="SlowMotionAnimation" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="SlowMotionAnimation" />
-            </menu_item_check>
             <menu_item_check
              label="Show Look At"
              name="Show Look At">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9dae77a304..44c18c2cce 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1291,6 +1291,45 @@ Visit [_URL] for more information?
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="AMDOldDriver"
+   type="alertmodal">
+    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://support.amd.com/us/Pages/AMDSupportHub.aspx
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="NVIDIAOldDriver"
+ type="alertmodal">
+    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://www.nvidia.com/Download/index.aspx?lang=en-us
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="UnknownGPU"
@@ -6744,7 +6783,7 @@ Is this OK?
    type="notify">
 Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
   
-It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account.
+Do not allow access if you do not fully understand why it wants access to your account.
 
   <tag>confirm</tag>
     <form name="form">
@@ -8252,4 +8291,3389 @@ Attempt cancelled.
      yestext="Yes"/>
   </notification>
 
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozen"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozenDuration"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouFrozeAvatar"
+   type="notify">
+   <tag>fail</tag>
+Avatar frozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarHasUnFrozenYou"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has unfrozen you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarUnFrozen"
+   type="notify">
+   <tag>fail</tag>
+Avatar unfrozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeFailure"
+   type="notify">
+   <tag>fail</tag>
+Freeze failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeThaw"
+   type="notify">
+   <tag>fail</tag>
+Your freeze expired, go about your business.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarCantFreeze"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't freeze that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NowOwnObject"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezOnLand"
+   type="notify">
+   <tag>fail</tag>
+Can't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailTooManyRequests"
+   type="notify">
+   <tag>fail</tag>
+Object can not be rezzed because there are too many requests.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailCantMove"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you cannot move at this time.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotAllowedOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you are not allowed on that land.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotSameRegion"
+   type="notify">
+   <tag>fail</tag>
+Try moving closer.  Can't sit on object because
+it is not in the same region as you.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="NoNewObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create new object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoOwnNoGardening"
+   type="notify">
+   <tag>fail</tag>
+You Can't create trees and grass on land you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddToNavMeshNoCopy"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DupeWithNoRootsSelected"
+   type="notify">
+   <tag>fail</tag>
+Duplicate with no root objects selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzRegionIsFull"
+   type="notify">
+   <tag>fail</tag>
+Can't duplicate objects because the region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzParcelNotFound"
+   type="notify">
+   <tag>fail</tag>
+Can't duplicate objects - Can't find the parcel they are on.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateCuzParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because 
+the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezAttemptFailed"
+   type="notify">
+   <tag>fail</tag>
+Attempt to rez an object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ToxicInvRezAttemptFailed"
+   type="notify">
+   <tag>fail</tag>
+Unable to create item that has caused problems on this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvItemIsBlacklisted"
+   type="notify">
+   <tag>fail</tag>
+That inventory item has been blacklisted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCanRezObjects"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="LandSearchBlocked"
+   type="notify">
+   <tag>fail</tag>
+Land Search Blocked.
+You have performed too many land searches too quickly.
+Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotEnoughResourcesToAttach"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouDiedAndGotTPHome"
+   type="notify">
+   <tag>fail</tag>
+You died and have been teleported to your home location
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectComingSoon"
+   type="notify">
+   <tag>fail</tag>
+You are no longer allowed here and have [EJECT_TIME] seconds to leave.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoEnterServerFull"
+   type="notify">
+   <tag>fail</tag>
+You can't enter this region because 
+the server is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveBackToInvDisabled"
+   type="notify">
+   <tag>fail</tag>
+Save Back To Inventory has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoExistNoSaveToContents"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveToContents"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSaveBackToInvDisabled"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSelCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoSelCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsNoRemoval"
+   type="notify">
+   <tag>fail</tag>
+Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveSelection"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSaveSelection"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoTaking"
+   type="notify">
+   <tag>fail</tag>
+You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezDestInternalError"
+   type="notify">
+   <tag>fail</tag>
+Internal Error: Unknown destination type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteFailObjNotFound"
+   type="notify">
+   <tag>fail</tag>
+Delete failed because object not found
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SorryCantEjectUser"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't eject that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionSezNotAHome"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomeLocationLimits"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomePositionSet"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjected"
+   type="notify">
+   <tag>fail</tag>
+Avatar ejected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Eject failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelPerms"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelResources"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectRegionVersion"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectNavMesh"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectWTF"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PhantomWithConcavePiece"
+   type="notify">
+   <tag>fail</tag>
+This object cannot have a concave piece because it is phantom and contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to add item!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableEditItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToCopyInventory"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to copy that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemDoesntExist"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemAlreadyExists"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item with that name already exists in inventory
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveModifyAttachment"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: This would modify the attachment permissions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Too many scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddScript"
+   type="notify">
+   <tag>fail</tag>
+Unable to add script!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AssetServerTimeoutObjReturn"
+   type="notify">
+   <tag>fail</tag>
+Asset server didn't respond in a timely fashion.  Object returned to sim.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisablePhysicsShapes"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics shapes enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+You cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetPhysicsPropertiesOnObjectType"
+   type="notify">
+   <tag>fail</tag>
+Cannot set physics properties on that object type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetRootPrimWithNoShape"
+   type="notify">
+   <tag>fail</tag>
+Cannot set root prim to have no shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoRegionSupportPhysMats"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics materials enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OnlyRootPrimPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Only root prims may have their physics materials adjusted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportCharacterPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Setting physics materials on characters is not yet supported.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidPhysMatProperty"
+   type="notify">
+   <tag>fail</tag>
+One or more of the specified physics material properties was invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterStitchingMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the stitching type of a mesh object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterShapeMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the shape of a mesh object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FullRegionCantEnter"
+   type="notify">
+   <tag>fail</tag>
+You can't enter this region because \nthe region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedOwnersDiffer"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- owners differ
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Link failed because you do not have edit permission.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPrims"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many primitives
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedCantLinkNoCopyNoTrans"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot link no-copy with no-transfer
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNothingLinkable"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- nothing linkable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPathfindingChars"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many pathfinding characters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedInsufficientLand"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- insufficient land resources
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooMuchPhysics"
+   type="notify">
+   <tag>fail</tag>
+Object uses too many physics resources -- its dynamics have been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedHomeByObjectOnParcel"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedHomeByObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object '[OBJECT_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByAttachment"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by an attachment on [ITEM_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOnParcel"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOwnedBy"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectUnknownUser"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttackMultipleObjOneSpot"
+   type="notify">
+   <tag>fail</tag>
+You can't attach multiple objects to one spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateMultipleObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+You can't create multiple objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjTimeOut"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Object is missing from database.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjUnknown"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The request timed out. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjMissingFromDB"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailureTookTooLong"
+   type="notify">
+   <tag>fail</tag>
+Rez failed, requested object took too long to load.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreatePlantsOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot create plants on this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRestoreObjectNoWorldPos"
+   type="notify">
+   <tag>fail</tag>
+Cannot restore object. No world position found.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectInvalidMeshData"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because its mesh data is invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectTooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because there are already too many scripts in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectNoAccess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to create objects there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObject"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidObjectParams"
+   type="notify">
+   <tag>fail</tag>
+Invalid object parameters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDuplicateObjectNoAcess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to duplicate objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantChangeShape"
+   type="notify">
+   <tag>fail</tag>
+You are not allowed to change this shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoAccessToClaimObjects"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to claim objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedFailedNoPermToDeedForGroup"
+   type="notify">
+   <tag>fail</tag>
+Deed failed because you do not have permission to deed objects for your group.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPrivsToBuyObject"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to buy objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectAvatarSittingOnIt"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because an avatar is sitting on it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WhyAreYouTryingToWearShrubbery"
+   type="notify">
+   <tag>fail</tag>
+Trees and grasses cannot be worn as attachments.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachGroupOwnedObjs"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach group-owned objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectsNotOwned"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNavmeshObjects"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that contribute to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectNoMovePermissions"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because you do not have permission to move it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNotEnoughScriptResources"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropItemTrialUser"
+   type="notify">
+   <tag>fail</tag>
+You can't drop objects here; try the Free Trial area.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropMeshAttachment"
+   type="notify">
+   <tag>fail</tag>
+You can't drop mesh attachments. Detach to inventory and then rez in world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: you don't have permission to drop there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientLandResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: insufficient available land resource.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachments: insufficient available resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropObjectFullParcel"
+   type="notify">
+   <tag>fail</tag>
+Cannot drop object here.  Parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTouchObjectBannedFromParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't touch/grab this object because you are banned from the land parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PlzNarrowDeleteParams"
+   type="notify">
+   <tag>fail</tag>
+Please narrow your delete parameters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToUploadAsset"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload asset.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTeleportCouldNotFindUser"
+   type="notify">
+   <tag>fail</tag>
+Could not find user to teleport home
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodlikeRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+godlike request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+generic request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantUploadPostcard"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload postcard.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFetchInventoryForGroupNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to fetch inventory details for the group notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeNotPermitted"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- not permitted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeCantConstructInventory"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- could not construct inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantParceInventoryInNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to parse inventory in notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainUploadFailed"
+   type="notify">
+   <tag>fail</tag>
+Terrain upload failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWritten"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWrittenStartingDownload"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written, starting download...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainBaked"
+   type="notify">
+   <tag>fail</tag>
+Terrain baked.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TenObjectsDisabledPlzRefresh"
+   type="notify">
+   <tag>fail</tag>
+Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UpdateViewerBuyParcel"
+   type="notify">
+   <tag>fail</tag>
+You need to update your viewer to buy this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked"
+   type="notify">
+   <tag>fail</tag>
+You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, this parcel is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuySalePriceOrLandAreaChanged"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, the sale price or land area has changed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotAuthorized"
+   type="notify">
+   <tag>fail</tag>
+You are not the authorized buyer for this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelAwaitingPurchaseAuth"
+   type="notify">
+   <tag>fail</tag>
+You cannot purchase this parcel because it is already awaiting purchase aut
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuildOverflowParcel"
+   type="notify">
+   <tag>fail</tag>
+You cannot build objects here because doing so would overflow the parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SelectedMultipleOwnedLand"
+   type="notify">
+   <tag>fail</tag>
+You selected land with different owners. Please select a smaller area and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantJoinTooFewLeasedParcels"
+   type="notify">
+   <tag>fail</tag>
+Not enough leased parcels in selection to join.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandMultipleParcelsSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandCantFindParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandWholeParcelSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandHasBeenDivided"
+   type="notify">
+   <tag>fail</tag>
+Land has been divided.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PassPurchased"
+   type="notify">
+   <tag>fail</tag>
+You purchased a pass.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisallowsClassifieds"
+   type="notify">
+   <tag>fail</tag>
+Region does not allow classified advertisements.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandPassExpireSoon"
+   type="notify">
+   <tag>fail</tag>
+Your pass to this land is about to expire.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoSuitableSurface"
+   type="notify">
+   <tag>fail</tag>
+There is no suitable surface to sit on, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoRoom"
+   type="notify">
+   <tag>fail</tag>
+No room to sit here, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AutopilotCanceled"
+   type="notify">
+   <tag>fail</tag>
+Autopilot canceled
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have permission
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDeedGroupLand"
+   type="notify">
+   <tag>fail</tag>
+Cannot deed group-owned land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyInventoryFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy inventory failed because you do not have enough L$
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyPassFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+You don't have enough L$ to buy a pass to this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyPassTryAgain"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy pass right now.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because \nthe parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedPlacingObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmarkForEvent"
+   type="notify">
+   <tag>fail</tag>
+Unable to create landmark for event.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodBeatsFreeze"
+   type="notify">
+   <tag>fail</tag>
+Your godlike powers break the freeze!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpecialPowersRequestFailedLogged"
+   type="notify">
+   <tag>fail</tag>
+Request for special powers failed. This request has been logged.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExpireExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is currently unable to process your request. The request timed out.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DieExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is unable to process your request.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddPrimitiveFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create primitve.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezObjectFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResetHomePositionNotLegal"
+   type="notify">
+   <tag>fail</tag>
+Reset Home position since Home wasn't legal.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantInviteRegionFull"
+   type="notify">
+   <tag>fail</tag>
+You cannot currently invite anyone to your location because the region is full. Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSetHomeAtRegion"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ListValidHomeLocations"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetHomePosition"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDerezInventoryError"
+   type="notify">
+   <tag>fail</tag>
+Cannot derez object due to inventory fault.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInv"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInvFolder"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory folder.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateInventory"
+   type="notify">
+   <tag>fail</tag>
+Cannot create that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmark"
+   type="notify">
+   <tag>fail</tag>
+Cannot create landmark.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateOutfit"
+   type="notify">
+   <tag>fail</tag>
+Cannot create outfit right now. Try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Inventory is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindInvItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to find inventory item.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindObject"
+   type="notify">
+   <tag>fail</tag>
+Unable to find object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTransfterMoneyRegionDisabled"
+   type="notify">
+   <tag>fail</tag>
+Money transfers to objects are currently disabled in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantPayNoAgent"
+   type="notify">
+   <tag>fail</tag>
+Could not figure out who to pay.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDonateToPublicObjects"
+   type="notify">
+   <tag>fail</tag>
+You cannot give L$ to public objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryCreationInWorldObjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Inventory creation on in-world object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UserBalanceOrLandUsageError"
+   type="notify">
+   <tag>fail</tag>
+An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LargePrimAgentIntersect"
+   type="notify">
+   <tag>fail</tag>
+Cannot create large prims that intersect other players.  Please re-try when other players have moved.
+  </notification>
+
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozen"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozenDuration"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouFrozeAvatar"
+   type="notify">
+   <tag>fail</tag>
+Avatar frozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarHasUnFrozenYou"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has unfrozen you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarUnFrozen"
+   type="notify">
+   <tag>fail</tag>
+Avatar unfrozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeFailure"
+   type="notify">
+   <tag>fail</tag>
+Freeze failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeThaw"
+   type="notify">
+   <tag>fail</tag>
+Your freeze expired, go about your business.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarCantFreeze"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't freeze that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NowOwnObject"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezOnLand"
+   type="notify">
+   <tag>fail</tag>
+Can't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailTooManyRequests"
+   type="notify">
+   <tag>fail</tag>
+Object can not be rezzed because there are too many requests.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailCantMove"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you cannot move at this time.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotAllowedOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you are not allowed on that land.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotSameRegion"
+   type="notify">
+   <tag>fail</tag>
+Try moving closer.  Can't sit on object because
+it is not in the same region as you.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="NoNewObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create new object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoOwnNoGardening"
+   type="notify">
+   <tag>fail</tag>
+You Can't create trees and grass on land you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddToNavMeshNoCopy"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DupeWithNoRootsSelected"
+   type="notify">
+   <tag>fail</tag>
+Duplicate with no root objects selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzRegionIsFull"
+   type="notify">
+   <tag>fail</tag>
+Can't duplicate objects because the region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzParcelNotFound"
+   type="notify">
+   <tag>fail</tag>
+Can't duplicate objects - Can't find the parcel they are on.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateCuzParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because 
+the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezAttemptFailed"
+   type="notify">
+   <tag>fail</tag>
+Attempt to rez an object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ToxicInvRezAttemptFailed"
+   type="notify">
+   <tag>fail</tag>
+Unable to create item that has caused problems on this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvItemIsBlacklisted"
+   type="notify">
+   <tag>fail</tag>
+That inventory item has been blacklisted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCanRezObjects"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="LandSearchBlocked"
+   type="notify">
+   <tag>fail</tag>
+Land Search Blocked.
+You have performed too many land searches too quickly.
+Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotEnoughResourcesToAttach"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouDiedAndGotTPHome"
+   type="notify">
+   <tag>fail</tag>
+You died and have been teleported to your home location
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectComingSoon"
+   type="notify">
+   <tag>fail</tag>
+You are no longer allowed here and have [EJECT_TIME] seconds to leave.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoEnterServerFull"
+   type="notify">
+   <tag>fail</tag>
+You can't enter this region because 
+the server is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveBackToInvDisabled"
+   type="notify">
+   <tag>fail</tag>
+Save Back To Inventory has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoExistNoSaveToContents"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveToContents"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSaveBackToInvDisabled"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSelCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoSelCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsNoRemoval"
+   type="notify">
+   <tag>fail</tag>
+Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveSelection"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSaveSelection"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoTaking"
+   type="notify">
+   <tag>fail</tag>
+You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezDestInternalError"
+   type="notify">
+   <tag>fail</tag>
+Internal Error: Unknown destination type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteFailObjNotFound"
+   type="notify">
+   <tag>fail</tag>
+Delete failed because object not found
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SorryCantEjectUser"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't eject that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionSezNotAHome"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomeLocationLimits"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomePositionSet"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjected"
+   type="notify">
+   <tag>fail</tag>
+Avatar ejected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Eject failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelPerms"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelResources"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectRegionVersion"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectNavMesh"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectWTF"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PhantomWithConcavePiece"
+   type="notify">
+   <tag>fail</tag>
+This object cannot have a concave piece because it is phantom and contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to add item!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableEditItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToCopyInventory"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to copy that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemDoesntExist"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemAlreadyExists"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item with that name already exists in inventory
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveModifyAttachment"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: This would modify the attachment permissions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Too many scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddScript"
+   type="notify">
+   <tag>fail</tag>
+Unable to add script!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AssetServerTimeoutObjReturn"
+   type="notify">
+   <tag>fail</tag>
+Asset server didn't respond in a timely fashion.  Object returned to sim.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisablePhysicsShapes"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics shapes enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+You cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetPhysicsPropertiesOnObjectType"
+   type="notify">
+   <tag>fail</tag>
+Cannot set physics properties on that object type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetRootPrimWithNoShape"
+   type="notify">
+   <tag>fail</tag>
+Cannot set root prim to have no shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoRegionSupportPhysMats"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics materials enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OnlyRootPrimPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Only root prims may have their physics materials adjusted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportCharacterPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Setting physics materials on characters is not yet supported.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidPhysMatProperty"
+   type="notify">
+   <tag>fail</tag>
+One or more of the specified physics material properties was invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterStitchingMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the stitching type of a mesh object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterShapeMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the shape of a mesh object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FullRegionCantEnter"
+   type="notify">
+   <tag>fail</tag>
+You can't enter this region because \nthe region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedOwnersDiffer"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- owners differ
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Link failed because you do not have edit permission.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPrims"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many primitives
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedCantLinkNoCopyNoTrans"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot link no-copy with no-transfer
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNothingLinkable"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- nothing linkable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPathfindingChars"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many pathfinding characters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedInsufficientLand"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- insufficient land resources
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooMuchPhysics"
+   type="notify">
+   <tag>fail</tag>
+Object uses too many physics resources -- its dynamics have been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedHomeByObjectOnParcel"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedHomeByObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object '[OBJECT_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByAttachment"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by an attachment on [ITEM_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOnParcel"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOwnedBy"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectUnknownUser"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttackMultipleObjOneSpot"
+   type="notify">
+   <tag>fail</tag>
+You can't attach multiple objects to one spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateMultipleObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+You can't create multiple objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjTimeOut"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Object is missing from database.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjUnknown"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The request timed out. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjMissingFromDB"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailureTookTooLong"
+   type="notify">
+   <tag>fail</tag>
+Rez failed, requested object took too long to load.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreatePlantsOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot create plants on this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRestoreObjectNoWorldPos"
+   type="notify">
+   <tag>fail</tag>
+Cannot restore object. No world position found.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectInvalidMeshData"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because its mesh data is invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectTooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because there are already too many scripts in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectNoAccess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to create objects there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObject"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidObjectParams"
+   type="notify">
+   <tag>fail</tag>
+Invalid object parameters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDuplicateObjectNoAcess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to duplicate objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantChangeShape"
+   type="notify">
+   <tag>fail</tag>
+You are not allowed to change this shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoAccessToClaimObjects"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to claim objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedFailedNoPermToDeedForGroup"
+   type="notify">
+   <tag>fail</tag>
+Deed failed because you do not have permission to deed objects for your group.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPrivsToBuyObject"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to buy objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectAvatarSittingOnIt"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because an avatar is sitting on it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WhyAreYouTryingToWearShrubbery"
+   type="notify">
+   <tag>fail</tag>
+Trees and grasses cannot be worn as attachments.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachGroupOwnedObjs"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach group-owned objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectsNotOwned"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNavmeshObjects"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that contribute to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectNoMovePermissions"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because you do not have permission to move it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNotEnoughScriptResources"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropItemTrialUser"
+   type="notify">
+   <tag>fail</tag>
+You can't drop objects here; try the Free Trial area.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropMeshAttachment"
+   type="notify">
+   <tag>fail</tag>
+You can't drop mesh attachments. Detach to inventory and then rez in world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: you don't have permission to drop there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientLandResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: insufficient available land resource.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachments: insufficient available resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropObjectFullParcel"
+   type="notify">
+   <tag>fail</tag>
+Cannot drop object here.  Parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTouchObjectBannedFromParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't touch/grab this object because you are banned from the land parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PlzNarrowDeleteParams"
+   type="notify">
+   <tag>fail</tag>
+Please narrow your delete parameters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToUploadAsset"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload asset.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTeleportCouldNotFindUser"
+   type="notify">
+   <tag>fail</tag>
+Could not find user to teleport home
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodlikeRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+godlike request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+generic request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantUploadPostcard"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload postcard.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFetchInventoryForGroupNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to fetch inventory details for the group notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeNotPermitted"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- not permitted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeCantConstructInventory"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- could not construct inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantParceInventoryInNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to parse inventory in notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainUploadFailed"
+   type="notify">
+   <tag>fail</tag>
+Terrain upload failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWritten"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWrittenStartingDownload"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written, starting download...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainBaked"
+   type="notify">
+   <tag>fail</tag>
+Terrain baked.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TenObjectsDisabledPlzRefresh"
+   type="notify">
+   <tag>fail</tag>
+Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UpdateViewerBuyParcel"
+   type="notify">
+   <tag>fail</tag>
+You need to update your viewer to buy this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked"
+   type="notify">
+   <tag>fail</tag>
+You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, this parcel is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuySalePriceOrLandAreaChanged"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, the sale price or land area has changed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotAuthorized"
+   type="notify">
+   <tag>fail</tag>
+You are not the authorized buyer for this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelAwaitingPurchaseAuth"
+   type="notify">
+   <tag>fail</tag>
+You cannot purchase this parcel because it is already awaiting purchase aut
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuildOverflowParcel"
+   type="notify">
+   <tag>fail</tag>
+You cannot build objects here because doing so would overflow the parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SelectedMultipleOwnedLand"
+   type="notify">
+   <tag>fail</tag>
+You selected land with different owners. Please select a smaller area and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantJoinTooFewLeasedParcels"
+   type="notify">
+   <tag>fail</tag>
+Not enough leased parcels in selection to join.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandMultipleParcelsSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandCantFindParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandWholeParcelSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandHasBeenDivided"
+   type="notify">
+   <tag>fail</tag>
+Land has been divided.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PassPurchased"
+   type="notify">
+   <tag>fail</tag>
+You purchased a pass.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisallowsClassifieds"
+   type="notify">
+   <tag>fail</tag>
+Region does not allow classified advertisements.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandPassExpireSoon"
+   type="notify">
+   <tag>fail</tag>
+Your pass to this land is about to expire.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoSuitableSurface"
+   type="notify">
+   <tag>fail</tag>
+There is no suitable surface to sit on, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoRoom"
+   type="notify">
+   <tag>fail</tag>
+No room to sit here, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AutopilotCanceled"
+   type="notify">
+   <tag>fail</tag>
+Autopilot canceled
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have permission
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDeedGroupLand"
+   type="notify">
+   <tag>fail</tag>
+Cannot deed group-owned land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyInventoryFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy inventory failed because you do not have enough L$
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyPassFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+You don't have enough L$ to buy a pass to this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyPassTryAgain"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy pass right now.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because \nthe parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedPlacingObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmarkForEvent"
+   type="notify">
+   <tag>fail</tag>
+Unable to create landmark for event.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodBeatsFreeze"
+   type="notify">
+   <tag>fail</tag>
+Your godlike powers break the freeze!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpecialPowersRequestFailedLogged"
+   type="notify">
+   <tag>fail</tag>
+Request for special powers failed. This request has been logged.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExpireExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is currently unable to process your request. The request timed out.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DieExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is unable to process your request.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddPrimitiveFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create primitve.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezObjectFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResetHomePositionNotLegal"
+   type="notify">
+   <tag>fail</tag>
+Reset Home position since Home wasn't legal.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantInviteRegionFull"
+   type="notify">
+   <tag>fail</tag>
+You cannot currently invite anyone to your location because the region is full. Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSetHomeAtRegion"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ListValidHomeLocations"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetHomePosition"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDerezInventoryError"
+   type="notify">
+   <tag>fail</tag>
+Cannot derez object due to inventory fault.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInv"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInvFolder"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory folder.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateInventory"
+   type="notify">
+   <tag>fail</tag>
+Cannot create that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmark"
+   type="notify">
+   <tag>fail</tag>
+Cannot create landmark.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateOutfit"
+   type="notify">
+   <tag>fail</tag>
+Cannot create outfit right now. Try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Inventory is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindInvItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to find inventory item.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindObject"
+   type="notify">
+   <tag>fail</tag>
+Unable to find object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTransfterMoneyRegionDisabled"
+   type="notify">
+   <tag>fail</tag>
+Money transfers to objects are currently disabled in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantPayNoAgent"
+   type="notify">
+   <tag>fail</tag>
+Could not figure out who to pay.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDonateToPublicObjects"
+   type="notify">
+   <tag>fail</tag>
+You cannot give L$ to public objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryCreationInWorldObjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Inventory creation on in-world object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UserBalanceOrLandUsageError"
+   type="notify">
+   <tag>fail</tag>
+An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
+  </notification>
+
+
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index eea2606125..df91ad8b5e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -254,7 +254,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          column_padding="0"
          draw_stripes="true"
          height="200"
-         follows="left|top"
+         follows="left|top|right"
          layout="topleft"
          left="0"
          right="-1"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index cdf14572fe..e844a15118 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -30,7 +30,7 @@
     (This page does not pass the specified whitelist)
   </text>
   <line_editor 
-   max_length="1024"
+   max_length_bytes="1024"
    bottom_delta="-24" 
    enabled="true" 
    follows="left|top" 
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index f6a8af0973..765b07ed8b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -158,6 +158,7 @@
      text_readonly_color="DkGray"
      width="487"
      show_line_numbers="true" 
+     enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index e69a17e037..6ee8fc3a4c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -292,6 +292,10 @@
                  label="Open"
                  name="Open"
                  value="Open" />
+       <combo_box.item
+          label="Zoom"
+          name="Zoom"
+          value="Zoom" />
             </combo_box>
 	 <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2157a05bbf..4383b98592 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1447,7 +1447,7 @@ integer llScriptDanger(vector pos)
 Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
 	</string>
 	<string name="LSLTipText_llDialog" translate="false">
-llDialog(key avatar, string message, list buttons, integer chat_channel
+llDialog(key avatar, string message, list buttons, integer chat_channel)
 Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
 If a button is pressed, the avatar says the text of the button label on chat_channel.
 	</string>
@@ -3330,7 +3330,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
-  <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
+  <string name="LocationCtrlSeeAVsTooltip">Avatars inside this parcel cannot be seen or heard by avatars outside this parcel</string>
   <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string>
   <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
-- 
cgit v1.2.3


From a49d3b14254fa5cfac3900e86b2287a016eaf9cc Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 15 Jan 2013 14:07:55 +0200
Subject: CHUI-567 FIXED "Translate chat", "Translation settings..." menu items
 are added.

---
 .../default/xui/en/menu_im_session_showmodes.xml     | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
index 483f24afd0..f2a8b39b04 100644
--- a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -44,7 +44,23 @@
          parameter="IMShowNamesForP2PConv" />
         <menu_item_check.on_enable
          function="IMSession.Menu.ShowModes.Enable"
-         parameter="IMShowNamesForP2PConv" />
-         
+         parameter="IMShowNamesForP2PConv" />    
     </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="Translate_chat" label="Translate chat">
+        <menu_item_check.on_click
+         function="Translating.Toggle" />
+        <menu_item_check.on_check
+         function="Translating.On" />
+        <menu_item_check.on_enable
+         function="Translating.Enabled" />
+    </menu_item_check>
+    <menu_item_check name="Translation_settings" label="Translation settings...">
+    <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="prefs_translation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="prefs_translation" />
+    </menu_item_check>     
 </toggleable_menu>
-- 
cgit v1.2.3


From 8a576ea16fe6f887458a2001ab9b0e5d2b41f58a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 16 Jan 2013 17:28:30 -0500
Subject: remove prototype access code used for server testing

---
 .../default/xui/en/floater_debug_materials.xml     | 995 ---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  10 -
 2 files changed, 1005 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_debug_materials.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
deleted file mode 100644
index 3a450fdeff..0000000000
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ /dev/null
@@ -1,995 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    positioning="cascading"
-    can_tear_off="false"
-    can_resize="true"
-    height="770"
-    width="1040"
-    min_height="795"
-    min_width="1040"
-    layout="topleft"
-    name="floater_debug_materials"
-    reuse_instance="true"
-    save_rect="false"
-    single_instance="true"
-    title="Debug materials">
-  <floater.string name="status_no_region">No current region available.</floater.string>
-  <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
-  <floater.string name="status_ready">Materials are enabled for this region.</floater.string>
-  <floater.string name="status_request_started">Request sent.</floater.string>
-  <floater.string name="status_request_completed">Request received.</floater.string>
-  <floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string>
-  <floater.string name="status_error">An error occurred during the request.</floater.string>
-  <floater.string name="loading_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
-  <floater.string name="loading_status_done">Complete</floater.string>
-  <floater.string name="querying_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
-  <floater.string name="querying_status_done">Complete</floater.string>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="61"
-      width="214">
-    <text
-        height="13"
-        word_wrap="true"
-        use_ellipses="false"
-        type="string"
-        text_color="LabelTextColor"
-        length="1"
-        layout="topleft"
-        left="0"
-        top_pad="0"
-        width="214">
-      Status
-    </text>
-    <text
-        height="40"
-        word_wrap="true"
-        use_ellipses="false"
-        type="string"
-        text_color="MaterialGoodColor"
-        length="1"
-        follows="left|top"
-        layout="topleft"
-        left="0"
-        name="material_status"
-        top_pad="8"
-        width="214">
-    </text>
-  </panel>
-  <tab_container
-      follows="left|top|right"
-      layout="topleft"
-      tab_position="top"
-      left="10"
-      top_pad="10"
-      height="670"
-      width="1020">
-    <panel
-        border="true"
-        bevel_style="none"
-        follows="left|top|right"
-        layout="topleft"
-        label="Current region"
-        height="641"
-        top_pad="10"
-        width="1020">
-      <panel
-          border="false"
-          bevel_style="none"
-          follows="left|top|right"
-          layout="topleft"
-          height="479"
-          top_pad="10"
-          width="1020">
-        <button
-            follows="left|top"
-            height="22"
-            label="Get"
-            layout="topleft"
-            name="get_button"
-            top_pad="0"
-            width="214"/>
-        <text
-            height="13"
-            word_wrap="true"
-            use_ellipses="false"
-            type="string"
-            text_color="LabelTextColor"
-            length="1"
-            follows="left|top"
-            layout="topleft"
-            left="2"
-            top_pad="8"
-            width="150">
-          Loading Status
-        </text>
-        <text
-            height="13"
-            word_wrap="true"
-            use_ellipses="false"
-            type="string"
-            text_color="MaterialGoodColor"
-            length="1"
-            follows="left|top"
-            layout="topleft"
-            left_pad="0"
-            name="loading_status"
-            top_pad="-13"
-            width="400">
-        </text>
-        <scroll_list
-            column_padding="0"
-            draw_heading="true"
-            follows="left|top|right"
-            height="135"
-            layout="topleft"
-            left="0"
-            top_pad="10"
-            tab_stop="false"
-            multi_select="false"
-            name="get_other_data_scroll_list"
-            width="775">
-          <scroll_list.columns
-              label="Material ID"
-              name="id"
-              dynamic_width="true" />
-          <scroll_list.columns
-              label="Specular Color"
-              name="specular_color"
-              width="120" />
-          <scroll_list.columns
-              label="Specular Exponent"
-              name="specular_exponent"
-              width="112" />
-          <scroll_list.columns
-              label="Env Intensity"
-              name="env_intensity"
-              width="80" />
-          <scroll_list.columns
-              label="Alpha Mask Cutoff"
-              name="alpha_mask_cutoff"
-              width="110" />
-          <scroll_list.columns
-              label="Diffuse Alpha Mode"
-              name="diffuse_alpha_mode"
-              width="118" />
-        </scroll_list>
-        <scroll_list
-            column_padding="0"
-            draw_heading="true"
-            follows="left|top|right"
-            height="135"
-            layout="topleft"
-            top_pad="10"
-            tab_stop="false"
-            multi_select="false"
-            name="get_specular_map_scroll_list"
-            width="1020">
-          <scroll_list.columns
-              label="Material ID"
-              name="id"
-              dynamic_width="true" />
-          <scroll_list.columns
-              label="Specular Map"
-              name="specular_map_list_map"
-              width="225" />
-          <scroll_list.columns
-              label="Offset X"
-              name="specular_map_list_offset_x"
-              width="112" />
-          <scroll_list.columns
-              label="Offset Y"
-              name="specular_map_list_offset_y"
-              width="112" />
-          <scroll_list.columns
-              label="Repeat X"
-              name="specular_map_list_repeat_x"
-              width="112" />
-          <scroll_list.columns
-              label="Repeat Y"
-              name="specular_map_list_repeat_y"
-              width="112" />
-          <scroll_list.columns
-              label="Rotation"
-              name="specular_map_list_rotation"
-              width="112" />
-        </scroll_list>
-        <scroll_list
-            column_padding="0"
-            draw_heading="true"
-            follows="left|top|right"
-            height="135"
-            layout="topleft"
-            top_pad="10"
-            tab_stop="false"
-            multi_select="false"
-            name="get_normal_map_scroll_list"
-            width="1020">
-          <scroll_list.columns
-              label="Material ID"
-              name="id"
-              dynamic_width="true" />
-          <scroll_list.columns
-              label="Normal Map"
-              name="normal_map_list_map"
-              width="225" />
-          <scroll_list.columns
-              label="Offset X"
-              name="normal_map_list_offset_x"
-              width="112" />
-          <scroll_list.columns
-              label="Offset Y"
-              name="normal_map_list_offset_y"
-              width="112" />
-          <scroll_list.columns
-              label="Repeat X"
-              name="normal_map_list_repeat_x"
-              width="112" />
-          <scroll_list.columns
-              label="Repeat Y"
-              name="normal_map_list_repeat_y"
-              width="112" />
-          <scroll_list.columns
-              label="Rotation"
-              name="normal_map_list_rotation"
-              width="112" />
-        </scroll_list>
-      </panel>
-    </panel>
-    <panel
-        border="true"
-        bevel_style="none"
-        follows="left|top|right"
-        layout="topleft"
-        label="Object editing"
-        height="641"
-        top_pad="10"
-        width="1010">
-      <panel
-          border="false"
-          bevel_style="none"
-          follows="left|top|right"
-          layout="topleft"
-          left="2"
-          top_pad="10"
-          height="420"
-          width="810">
-        <panel
-            border="false"
-            bevel_style="none"
-            follows="left|top|right"
-            layout="topleft"
-            height="265"
-            top_pad="0"
-            width="810">
-          <panel
-              border="false"
-              bevel_style="none"
-              follows="left|top|right"
-              layout="topleft"
-              height="226"
-              top_pad="0"
-              width="263">
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left="0"
-                top_pad="38"
-                width="160">
-              Normal Map
-            </text>
-            <texture_picker
-                allow_no_texture="true"
-                can_apply_immediately="true"
-                default_image_name="Default"
-                follows="left|top"
-                left_pad="0"
-                top_pad="-50"
-                label_width="0"
-                height="100"
-                width="100"
-                mouse_opaque="true"
-                name="normal_map"
-                tool_tip="Click to open texture picker" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-260"
-                label="Normal Map Offset X"
-                max_val="1.0"
-                min_val="-1.0"
-                name="normal_map_offset_x"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Normal Map Offset Y"
-                max_val="1.0"
-                min_val="-1.0"
-                name="normal_map_offset_y"
-                top_pad="10"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Normal Map Repeat X"
-                max_val="64"
-                min_val="0.0"
-                name="normal_map_repeat_x"
-                top_pad="10"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                max_val="64"
-                min_val="0.0"
-                label="Normal Map Repeat Y"
-                name="normal_map_repeat_y"
-                top_pad="10"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Normal Map Rotation"
-                max_val="9999"
-                min_val="-9999"
-                name="normal_map_rotation"
-                top_pad="10"
-                width="240" />
-          </panel>
-          <panel
-              border="false"
-              bevel_style="none"
-              follows="left|top|right"
-              layout="topleft"
-              height="226"
-              top_pad="-226"
-              left_pad="20"
-              width="263">
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left="0"
-                top_pad="38"
-                width="160">
-              Specular Map
-            </text>
-            <texture_picker
-                allow_no_texture="true"
-                can_apply_immediately="true"
-                default_image_name="Default"
-                follows="left|top"
-                left_pad="0"
-                top_pad="-50"
-                label_width="0"
-                height="100"
-                width="100"
-                mouse_opaque="true"
-                name="specular_map"
-                tool_tip="Click to open texture picker" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-260"
-                label="Specular Map Offset X"
-                max_val="1.0"
-                min_val="-1.0"
-                name="specular_map_offset_x"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Specular Map Offset Y"
-                max_val="1.0"
-                min_val="-1.0"
-                name="specular_map_offset_y"
-                top_pad="10"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Specular Map Repeat X"
-                max_val="64"
-                min_val="0.0"
-                name="specular_map_repeat_x"
-                top_pad="10"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="0.1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Specular Map Repeat Y"
-                max_val="64"
-                min_val="0.0"
-                name="specular_map_repeat_y"
-                top_pad="10"
-                width="240" />
-            <spinner
-                allow_text_entry="true"
-                follows="left|top"
-                height="20"
-                initial_value="0"
-                increment="1"
-                decimal_digits="4"
-                label_width="160"
-                layout="topleft"
-                left_pad="-240"
-                label="Specular Map Rotation"
-                max_val="9999"
-                min_val="-9999"
-                name="specular_map_rotation"
-                top_pad="10"
-                width="240" />
-          </panel>
-          <panel
-              border="false"
-              bevel_style="none"
-              follows="left|top|right"
-              layout="topleft"
-              height="162"
-              top_pad="-226"
-              left_pad="20"
-              width="243">
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left="0"
-                top_pad="10"
-                width="160">
-              Specular Color
-            </text>
-            <color_swatch
-                can_apply_immediately="true"
-                color="1 1 1 1"
-                follows="left|top"
-                height="30"
-                layout="topleft"
-                label_height="0"
-                label_width="0"
-                left_pad="0"
-                top_pad="-22"
-                name="specular_color"
-                tool_tip="Click to open color picker"
-                width="40" />
-            <spinner
-                follows="left|top"
-                height="20"
-                initial_value="255"
-                max_val="255"
-                min_val="0"
-                increment="1"
-                decimal_digits="0"
-                allow_text_entry="true"
-                layout="topleft"
-                label_width="160"
-                left="0"
-                top_pad="10"
-                label="Specular Color Alpha"
-                name="specular_color_alpha"
-                width="240" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-240"
-                top_pad="13"
-                width="160">
-              Specular Exponent
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
-                follows="left|top"
-                height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="specular_exponent"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-240"
-                top_pad="10"
-                width="160">
-              Environment Exponent
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
-                follows="left|top"
-                height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="environment_exponent"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-240"
-                top_pad="10"
-                width="160">
-              Alpha Mask Cuttoff
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
-                follows="left|top"
-                height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="alpha_mask_cutoff"
-                width="80" />
-            <text
-                height="13"
-                word_wrap="false"
-                use_ellipses="false"
-                type="string"
-                text_color="LabelTextColor"
-                length="1"
-                follows="left|top"
-                layout="topleft"
-                left_pad="-240"
-                top_pad="10"
-                width="160">
-              Diffuse Alpha Mode
-            </text>
-            <line_editor
-                border_style="line"
-                border_thickness="1"
-                default_text="0"
-                follows="left|top"
-                height="20"
-                layout="topleft"
-                left_pad="0"
-                top_pad="-18"
-                max_length_chars="255"
-                name="diffuse_alpha_mode"
-                width="80" />
-          </panel>
-          <panel
-              border="false"
-              bevel_style="none"
-              follows="left|top|right"
-              layout="topleft"
-              height="22"
-              left="0"
-              top_pad="80"
-              width="810">
-            <button
-                follows="left|top"
-                height="22"
-                label="Set Face Data"
-                layout="topleft"
-                name="put_set_button"
-                left="0"
-                top="0"
-                width="214"/>
-            <button
-                follows="left|top"
-                height="22"
-                label="Clear Face Data"
-                layout="topleft"
-                name="put_clear_button"
-                left_pad="20"
-                width="214"/>
-            <button
-                follows="left|top"
-                height="22"
-                label="Reset Input Values"
-                layout="topleft"
-                name="reset_put_values_button"
-                left_pad="146"
-                width="214"/>
-          </panel>
-        </panel>
-        <view_border
-            bevel_style="none"
-            follows="left|top"
-            height="0"
-            layout="topleft"
-            name="horiz_separator"
-            top_pad="10"
-            left="0"
-            width="810"/>
-        <panel
-            border="false"
-            bevel_style="none"
-            follows="left|top|right"
-            layout="topleft"
-            height="125"
-            top_pad="20"
-            width="400">
-          <text
-              height="13"
-              word_wrap="false"
-              use_ellipses="false"
-              type="string"
-              text_color="LabelTextColor"
-              length="1"
-              follows="left|top"
-              layout="topleft"
-              left="0"
-              top_pad="0"
-              width="160">
-            Active selection
-          </text>
-          <scroll_list
-              column_padding="0"
-              draw_heading="true"
-              follows="left|top|right"
-              height="300"
-              layout="topleft"
-              left="0"
-              top_pad="10"
-              tab_stop="false"
-              multi_select="true"
-              name="put_scroll_list"
-              width="600">
-            <scroll_list.columns
-                label="Object ID"
-                name="object_id"
-                width="225" />
-            <scroll_list.columns
-                label="Face Index"
-                name="face_index"
-                width="70" />
-            <scroll_list.columns
-                label="MaterialID"
-                name="material_id"
-                dynamic_width="true" />
-          </scroll_list>
-        </panel>
-      </panel>
-    </panel>
-    <panel
-        border="true"
-        bevel_style="none"
-        follows="left|top|right"
-        layout="topleft"
-        label="Viewable objects"
-        height="641"
-        top_pad="10"
-        width="1020">
-      <panel
-          border="false"
-          bevel_style="none"
-          follows="left|top|right"
-          layout="topleft"
-          height="641"
-          top_pad="0"
-          width="1020">
-        <panel
-            border="false"
-            bevel_style="none"
-            follows="left|top|right"
-            layout="topleft"
-            left="0"
-            top_pad="10"
-            height="153"
-            width="835">
-          <button
-              follows="left|top"
-              height="22"
-              label="Query Viewable Objects"
-              layout="topleft"
-              name="query_viewable_objects_button"
-              top_pad="0"
-              width="214"/>
-          <text
-              height="13"
-              word_wrap="true"
-              use_ellipses="false"
-              type="string"
-              text_color="LabelTextColor"
-              length="1"
-              follows="left|top"
-              layout="topleft"
-              left="2"
-              top_pad="8"
-              width="150">
-            Loading Status
-          </text>
-          <text
-              height="13"
-              word_wrap="true"
-              use_ellipses="false"
-              type="string"
-              text_color="MaterialGoodColor"
-              length="1"
-              follows="left|top"
-              layout="topleft"
-              left_pad="0"
-              name="query_status"
-              top_pad="-13"
-              width="400">
-          </text>
-          <scroll_list
-              column_padding="0"
-              draw_heading="true"
-              follows="left|top|right"
-              height="100"
-              layout="topleft"
-              top_pad="10"
-              left="0"
-              tab_stop="false"
-              multi_select="true"
-              name="viewable_objects_scroll_list"
-              width="835">
-            <scroll_list.columns
-                label="Object ID"
-                name="object_id"
-                width="225" />
-            <scroll_list.columns
-                label="Region"
-                name="region"
-                width="225" />
-            <scroll_list.columns
-                label="Local ID"
-                name="local_id"
-                width="70" />
-            <scroll_list.columns
-                label="Face"
-                name="face_index"
-                width="70" />
-            <scroll_list.columns
-                label="Material ID"
-                name="material_id"
-                dynamic_width="true" />
-          </scroll_list>
-        </panel>
-        <view_border
-            bevel_style="none"
-            follows="left|right|top"
-            height="0"
-            layout="topleft"
-            name="horiz_separator"
-            top_pad="10"
-            left="0"
-            width="1020"/>
-        <panel
-            border="false"
-            bevel_style="none"
-            follows="left|top|right"
-            layout="topleft"
-            height="457"
-            top_pad="10"
-            width="1020">
-          <button
-              follows="left|top"
-              height="22"
-              label="Post Material ID"
-              layout="topleft"
-              name="post_button"
-              top_pad="0"
-              width="214"/>
-          <scroll_list
-              column_padding="0"
-              draw_heading="true"
-              follows="left|top|right"
-              height="135"
-              layout="topleft"
-              top_pad="10"
-              left="0"
-              tab_stop="false"
-              multi_select="false"
-              name="post_other_data_scroll_list"
-              width="775">
-            <scroll_list.columns
-                label="Material ID"
-                name="id"
-                dynamic_width="true" />
-            <scroll_list.columns
-                label="Specular Color"
-                name="specular_color"
-                width="120" />
-            <scroll_list.columns
-                label="Specular Exponent"
-                name="specular_exponent"
-                width="112" />
-            <scroll_list.columns
-                label="Env Intensity"
-                name="env_intensity"
-                width="80" />
-            <scroll_list.columns
-                label="Alpha Mask Cutoff"
-                name="alpha_mask_cutoff"
-                width="110" />
-            <scroll_list.columns
-                label="Diffuse Alpha Mode"
-                name="diffuse_alpha_mode"
-                width="118" />
-          </scroll_list>
-          <scroll_list
-              column_padding="0"
-              draw_heading="true"
-              follows="left|top|right"
-              height="135"
-              layout="topleft"
-              top_pad="10"
-              tab_stop="false"
-              multi_select="false"
-              name="post_specular_map_scroll_list"
-              width="1020">
-            <scroll_list.columns
-                label="Material ID"
-                name="id"
-                dynamic_width="true" />
-            <scroll_list.columns
-                label="Specular Map"
-                name="specular_map_list_map"
-                width="225" />
-            <scroll_list.columns
-                label="Offset X"
-                name="specular_map_list_offset_x"
-                width="112" />
-            <scroll_list.columns
-                label="Offset Y"
-                name="specular_map_list_offset_y"
-                width="112" />
-            <scroll_list.columns
-                label="Repeat X"
-                name="specular_map_list_repeat_x"
-                width="112" />
-            <scroll_list.columns
-                label="Repeat Y"
-                name="specular_map_list_repeat_y"
-                width="112" />
-            <scroll_list.columns
-                label="Rotation"
-                name="specular_map_list_rotation"
-                width="112" />
-          </scroll_list>
-          <scroll_list
-              column_padding="0"
-              draw_heading="true"
-              follows="left|top|right"
-              height="135"
-              layout="topleft"
-              top_pad="10"
-              tab_stop="false"
-              multi_select="false"
-              name="post_normal_map_scroll_list"
-              width="1020">
-            <scroll_list.columns
-                label="Material ID"
-                name="id"
-                dynamic_width="true" />
-            <scroll_list.columns
-                label="Normal Map"
-                name="normal_map_list_map"
-                width="225" />
-            <scroll_list.columns
-                label="Offset X"
-                name="normal_map_list_offset_x"
-                width="112" />
-            <scroll_list.columns
-                label="Offset Y"
-                name="normal_map_list_offset_y"
-                width="112" />
-            <scroll_list.columns
-                label="Repeat X"
-                name="normal_map_list_repeat_x"
-                width="112" />
-            <scroll_list.columns
-                label="Repeat Y"
-                name="normal_map_list_repeat_y"
-                width="112" />
-            <scroll_list.columns
-                label="Rotation"
-                name="normal_map_list_rotation"
-                width="112" />
-          </scroll_list>
-        </panel>
-      </panel>
-    </panel>
-  </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 721a1818dd..bbcf7bc3ef 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2622,16 +2622,6 @@
 
           <menu_item_separator/>
 
-          <menu_item_call
-              label="Debug materials ..."
-              name="DebugMaterialsMenu">
-            <menu_item_call.on_click
-                function="Floater.ToggleOrBringToFront"
-                parameter="floater_debug_materials" />
-          </menu_item_call>
-
-          <menu_item_separator />
-
           <menu_item_check
              label="Debug GL"
              name="Debug GL">
-- 
cgit v1.2.3


From 5eef65e99476b716985eeccfbbcdafdfb664cb1a Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 18 Jan 2013 03:52:42 +0200
Subject: CHUI-379 FIXED Restore Voice Morphing menu

---
 .../skins/default/xui/en/floater_voice_effect.xml  |  3 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 39 ++++++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 35cb2670d0..146c3d7e30 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -5,12 +5,13 @@
  height="500"
  name="voice_effects"
  help_topic="voice_effects"
- title="VOICE MORPHING"
+ title="VOICE MORPHING PREVIEW"
  background_visible="true"
  label="Places"
  layout="topleft"
  min_height="360"
  min_width="200"
+ save_rect="true"
  width="300">
   <string name="no_voice_effect">
     (No Voice Morph)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8d5e3f0b5d..10fd8138d2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -268,17 +268,36 @@
              parameter="conversation" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu_item_check
-         label="Voice morphing..."
-         name="ShowVoice"
+        <menu
+         label="Voice morphing"
+         name="VoiceMorphing"
          visibility_control="VoiceMorphingEnabled">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="voice_effect" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="voice_effect" />
-        </menu_item_check>
+            <menu_item_check
+             label="No voice morphing"
+             name="NoVoiceMorphing">
+                <menu_item_check.on_check
+                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" />
+                <menu_item_check.on_click
+                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" />
+            </menu_item_check>
+            <menu_item_separator/>
+            <menu_item_check
+             label="Preview..."
+             name="Preview">
+                <menu_item_check.on_check
+                 function="Floater.Visible"
+                 parameter="voice_effect" />
+                <menu_item_check.on_click
+                 function="Floater.Toggle"
+                 parameter="voice_effect" />
+            </menu_item_check>
+            <menu_item_call
+             label="Subscribe..."
+             name="Subscribe">
+                <menu_item_call.on_click
+                 function="Communicate.VoiceMorphing.Subscribe" />
+            </menu_item_call>
+        </menu>
         <menu_item_check
          label="Gestures..."
          name="Gestures"
-- 
cgit v1.2.3


From 824457f98c93a2f48f402740982a410b9fbc3487 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Mon, 21 Jan 2013 14:10:12 +0200
Subject: CHUI-567 FIXED Menu items are moved to Participant view menu

---
 .../default/xui/en/menu_im_session_showmodes.xml     | 19 +------------------
 .../skins/default/xui/en/menu_participant_view.xml   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
index f2a8b39b04..b0adca0e0e 100644
--- a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -45,22 +45,5 @@
         <menu_item_check.on_enable
          function="IMSession.Menu.ShowModes.Enable"
          parameter="IMShowNamesForP2PConv" />    
-    </menu_item_check>
-    <menu_item_separator layout="topleft" />
-    <menu_item_check name="Translate_chat" label="Translate chat">
-        <menu_item_check.on_click
-         function="Translating.Toggle" />
-        <menu_item_check.on_check
-         function="Translating.On" />
-        <menu_item_check.on_enable
-         function="Translating.Enabled" />
-    </menu_item_check>
-    <menu_item_check name="Translation_settings" label="Translation settings...">
-    <menu_item_check.on_check
-         function="Floater.Visible"
-         parameter="prefs_translation" />
-        <menu_item_check.on_click
-         function="Floater.Toggle"
-         parameter="prefs_translation" />
-    </menu_item_check>     
+    </menu_item_check>      
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 2f2bafb95d..7ea87ee05c 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -89,4 +89,24 @@
          function="Avatar.EnableItem"
          parameter="conversation_log" />
     </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="Translate_chat" label="Translate Nearby chat">
+        <menu_item_check.on_click
+         function="IMFloaterContainer.Action" 
+         parameter="Translating.Toggle" />
+        <menu_item_check.on_check
+         function="IMFloaterContainer.Check" 
+         parameter="Translating.On" />
+        <menu_item_check.on_enable
+         function="IMFloaterContainer.Check" 
+         parameter="Translating.Enabled" />
+    </menu_item_check>
+    <menu_item_check name="Translation_settings" label="Translation settings...">
+    <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="prefs_translation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="prefs_translation" />
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 57795d3c89b6eee3ff68f327d2a6c840350d8dcb Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Mon, 28 Jan 2013 18:53:46 +0200
Subject: CHUI-706 FIXED Appropriate function is now called in xml

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
index 2cb125ce09..c5eaf94d22 100644
--- a/indra/newview/skins/default/xui/en/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
@@ -7,7 +7,7 @@
      layout="topleft"
      name="show_group">
         <menu_item_call.on_click
-         function="Url.ShowProfile" />
+         function="Url.Execute" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-- 
cgit v1.2.3


From 2ac99f55f9e562e4ff8ebde4cba8270f1048c28d Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 24 Jan 2013 19:56:13 +0200
Subject: CHUI-578 FIXED Move preferences for conversation logs/transcripts to
 chat tab

---
 .../newview/skins/default/xui/en/notifications.xml |  26 ++
 .../default/xui/en/panel_preferences_chat.xml      | 284 ++++++++++++++-------
 .../default/xui/en/panel_preferences_privacy.xml   | 226 +++++-----------
 3 files changed, 283 insertions(+), 253 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6a464ccdc4..9c36873141 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8316,4 +8316,30 @@ Attempt cancelled.
      yestext="Yes"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceChatClearLog"
+   type="alertmodal">
+    This will delete the log of previous conversations, and all transcripts of those conversations. Proceed?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I delete the log of previous conversations."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceChatDeleteTranscripts"
+   type="alertmodal">
+    This will delete transcripts for all previous conversations. The list of conversations will not be affected. Proceed?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I delete transcripts."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 37bfbae991..4f33699aa6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
     border="true"
-    follows="left|top|right|bottom"
+    has_border="true"
     height="408"
     label="Text Chat"
     layout="topleft"
@@ -12,8 +12,7 @@
 
   <panel
       border="false"
-      follows="left|top"
-      height="90"
+      height="60"
       layout="topleft"
       top="10"
       left="13"
@@ -27,7 +26,9 @@
         layout="topleft"
         top="0"
         name="play_typing_animation"
-        width="330" />
+        width="330">
+    </check_box>
+
     <check_box
         enabled="false"
         height="16"
@@ -35,26 +36,21 @@
         layout="topleft"
         name="send_im_to_email"
         top_pad="6"
-        width="330" />
-    <check_box
-        control_name="KeepConversationLogTranscripts"
-        height="16"
-        label="Keep a conversation log and transcripts"
-        layout="topleft"
-        name="keep_convo_log_and_transcripts"
-        top_pad="6"
-        width="330" />
+        width="330">
+    </check_box>
+
     <check_box
-        control_name="UseChatBubbles"
-        follows="left|top"
+        control_name="VoiceCallsFriendsOnly"
         height="16"
-        label="Bubble Chat"
+        label="Only friends and groups can call or IM me"
         layout="topleft"
+        name="voice_call_friends_only_check"
         top_pad="6"
-        name="bubble_text_chat"
-        width="330" />
+        width="350">
+      <check_box.label_text text_color="White" />
+    </check_box>
+
     <text
-        follows="left|top"
         layout="topleft"
         left="345"
         height="12"
@@ -63,67 +59,65 @@
         top="0">
       Font size:
     </text>
-    <radio_group
-        height="90"
-        layout="topleft"
-        left="352"
+
+    <combo_box
         control_name="ChatFontSize"
+        height="23"
+        layout="topleft"
+        left="341"
         name="chat_font_size"
-        top_pad="0"
-        width="50">
-      <radio_item
-          height="16"
+        top_pad="5"
+        width="100">
+      <item
           label="Small"
-          layout="topleft"
-          name="radio"
-          value="0"
-          top="10"
-          width="125" />
-      <radio_item
-          height="16"
+          name="Small"
+          value="0"/>
+      <item
           label="Medium"
-          layout="topleft"
-          name="radio2"
-          value="1"
-          top_pad="6"
-          width="125" />
-      <radio_item
-          height="16"
+          name="Medium"
+          value="1"/>
+      <item
           label="Large"
-          layout="topleft"
-          name="radio3"
-          value="2"
-          top_pad="6"
-          width="125" />
-    </radio_group>    
-    
-  </panel>  
+          name="Large"
+          value="2"/>
+      <combo_box.drop_down_button label_color="White" />
+    </combo_box>
+
+    <check_box
+        control_name="UseChatBubbles"
+        height="16"
+        label="Bubble Chat"
+        layout="topleft"
+        top_pad="4"
+        name="bubble_text_chat"
+        width="330">
+    </check_box>
+      
+  </panel>
 
   <panel
       border="false"
-      follows="left|top"
-      height="198"
+      height="165"
       layout="topleft"
       left="13"
       width="517">
 
     <text
-        follows="left|top"
         layout="topleft"
         height="12"
         name="notifications"
         left="0"
+        text_color="White"
         width="120">
-      Notifications:
+      Notifications
     </text>
     <text
-        follows="left|top"
         layout="topleft"
         height="12"
         name="friend_ims"
         width="145"
         left="0"
-        top_pad="15">
+        top_pad="13">
       Friend IMs:
     </text>
     <combo_box
@@ -134,31 +128,30 @@
         top_delta="-6"
         name="FriendIMOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>      
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         height="12"
         name="non_friend_ims"
         width="145"
         left="0"
-        top_pad="15">
+        top_pad="9">
       Non-friend IMs:
     </text>
     <combo_box
@@ -169,31 +162,30 @@
         top_delta="-6"
         name="NonFriendIMOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="13"
         name="conference_ims"
         width="145"
-        top_pad="14">
+        top_pad="9">
       Conference IMs:
     </text>
     <combo_box
@@ -204,31 +196,30 @@
         top_delta="-6"
         name="ConferenceIMOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="13"
         name="group_chat"
         width="145"
-        top_pad="14">
+        top_pad="9">
       Group chat:
     </text>
     <combo_box
@@ -239,31 +230,30 @@
         top_delta="-6"
         name="GroupChatOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="12"
         name="nearby_chat"
         width="145"
-        top_pad="14">
+        top_pad="9">
       Nearby chat:
     </text>
     <combo_box
@@ -274,31 +264,30 @@
         top_delta="-6"
         name="NearbyChatOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolBarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="13"
         name="notifications_alert"
         width="500"
-        top_pad="11"
+        top_pad="9"
         visible="true"
         text_color="DrYellow">
       To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
@@ -308,14 +297,13 @@
 
   <panel
       border="false"
-      follows="left|top"
-      height="67"
+      height="50"
       layout="topleft"
       left="13"
+      top_pad="10"
       width="517">
 
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         name="play_sound"
@@ -360,9 +348,123 @@
         width="150" />
 
   </panel>
+
+  <view_border
+      bevel_style="none"
+      height="0"
+      layout="topleft"
+      left="13"
+      name="cost_text_border"
+      top_pad="5"
+      width="495"/>
+
+  <panel
+      height="50"
+      layout="topleft"
+      left="13"
+      top_pad="10"
+      width="505">
+
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top="5"
+        width="55">
+        Save:
+    </text>
+
+    <combo_box
+        control_name="KeepConversationLogTranscripts"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        name="chat_font_size"
+        top="0"
+        width="165">
+        <item
+            label="Log and transcripts"
+            value="2"/>
+        <item
+            label="Log only"
+            value="1"/>
+        <item
+            label="No log or transcripts"
+            value="0"/>
+        <drop_down_button label_color="White" />
+    </combo_box>
+
+    <button
+        enabled="false"
+        height="23"
+        label="Clear log..."
+        label_color="White"
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="clear_log"
+        width="110">
+        <commit_callback
+            function="Pref.ClearLog" />
+    </button>
+  
+    <button
+        enabled="false"
+        height="23"
+        label="Delete transcripts..."
+        label_color="White"
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="delete_transcripts"
+        width="147">
+        <button.commit_callback
+            function="Pref.DeleteTranscripts" />
+    </button>
+  
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top_pad="15"
+        width="55">
+        Location:
+    </text>
+  
+    <line_editor
+        control_name="InstantMessageLogPath"
+        border_style="line"
+        border_thickness="1"
+        font="SansSerif"
+        height="23"
+        layout="topleft"
+        left_pad="55"
+        max_length="4096"
+        name="log_path_string"
+        top_delta="-5"
+        width="185">
+    </line_editor>
+  
+    <button
+        enabled="false"
+        follows="left|top"
+        height="23"
+        label="Browse..."
+        label_color="White"
+        label_selected="Browse"
+        layout="topleft"
+        left_pad="5"
+        name="log_path_button"
+        top_delta="0"
+        width="112">
+      <commit_callback function="Pref.LogPath" />
+    </button>
+
+  </panel>
   
   <button
-      follows="left|top"
       height="23"
       label="Translation..."
       layout="topleft"
@@ -370,11 +472,10 @@
       name="ok_btn"
       top="-29"
       width="170">
-    <button.commit_callback
+    <commit_callback
         function="Pref.TranslationSettings" />
   </button>
   <button
-      follows="top|left"
       height="23"
       layout="topleft"
       top_pad="-23"
@@ -385,7 +486,6 @@
       width="150">
   </button>
   <button
-      follows="top|left"
       height="23"
       layout="topleft"
       top_pad="-23"
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 587c461bee..78743d26bb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -1,72 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Communication"
- layout="topleft"
- left="102"
- name="im"
- top="1"
- width="517">
-    <panel.string
-     name="log_in_to_change">
-        log in to change
-    </panel.string>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Clear History"
-     tool_tip="Clear login image, last location, teleport history, web, and texture cache"
-     layout="topleft"
-     left="30"
-     name="clear_cache"
-     top="10"
-     width="145">
-        <button.commit_callback
-         function="Pref.WebClearCache" />
-    </button>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="10"
-     mouse_opaque="false"
-     name="cache_size_label_l"
-     top_delta="3"
-     text_color="LtGray_50"
-     width="300">
-       (Locations, images, web, search history)
-    </text>
-    <check_box
-	 height="16"
-     enabled="false"
-     label="Show me in Search results"
-     layout="topleft"
-     left="30"
-     name="online_searchresults"
-     top_pad="20"
-     width="350" />
-    <check_box
-	 height="16"
-	 enabled="false"
-     label="Only friends and groups know I'm online"
-     layout="topleft"
-     left="30"
-     name="online_visibility"
-     top_pad="30"
-     width="350" />
-    <check_box
-     control_name="VoiceCallsFriendsOnly"
-     height="16"
-     label="Only friends and groups can call or IM me"
-     layout="topleft"
-     left="30"
-     name="voice_call_friends_only_check"
-     top_pad="10"
-     width="350" />
+    border="true"
+    follows="left|top|right|bottom"
+    height="408"
+    label="Communication"
+    layout="topleft"
+    left="102"
+    name="im"
+    top="1"
+    width="517">
+
+  <panel.string
+      name="log_in_to_change">
+    log in to change
+  </panel.string>
+
+  <button
+      follows="left|bottom"
+      height="23"
+      label="Clear History"
+      tool_tip="Clear login image, last location, teleport history, web, and texture cache"
+      layout="topleft"
+      left="30"
+      name="clear_cache"
+      top="10"
+      width="145">
+    <button.commit_callback
+        function="Pref.WebClearCache" />
+  </button>
+
+  <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="10"
+      mouse_opaque="false"
+      name="cache_size_label_l"
+      top_delta="3"
+      text_color="LtGray_50"
+      width="300">
+    (Locations, images, web, search history)
+  </text>
+
+  <check_box
+      height="16"
+      enabled="false"
+      label="Show me in Search results"
+      layout="topleft"
+      left="30"
+      name="online_searchresults"
+      top_pad="20"
+      width="350" />
+
+  <check_box
+      height="16"
+      enabled="false"
+      label="Only friends and groups know I'm online"
+      layout="topleft"
+      left="30"
+      name="online_visibility"
+      top_pad="30"
+      width="350" />
+    
     <check_box
      enabled_control="EnableVoiceChat"
      control_name="AutoDisengageMic"
@@ -87,100 +84,7 @@
      name="favorites_on_login_check"
      top_pad="10"
      width="350" />
-	<text
-      type="string"
-    length="1"
-    follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     mouse_opaque="false"
-     name="Logs:"
-     top_pad="20"
-     width="350">
-        Chat Logs:
-    </text>
-    <check_box
-	 enabled="false"
-     control_name="LogNearbyChat"
-     height="16"
-     label="Save nearby chat logs on my computer"
-     layout="topleft"
-     left="30"
-     name="log_nearby_chat"
-     top_pad="10"
-     width="350">
-    </check_box>
-    <check_box
-	 enabled="false"
-     control_name="LogInstantMessages"
-     height="16"
-     label="Save IM logs on my computer"
-     layout="topleft"
-     left="30"
-     name="log_instant_messages"
-     top_pad="10"
-     width="350">
-    </check_box>
-    <check_box
-     control_name="LogTimestamp"
-	 enabled="false"
-     height="16"
-     label="Add timestamp to each line in chat log"
-     layout="topleft"
-     left_delta="0"
-     name="show_timestamps_check_im"
-     top_pad="10"
-     width="237" />
-	<check_box
-     control_name="LogFileNamewithDate"
-     enabled="false"
-     height="16"
-     label="Add datestamp to log file name."
-     layout="topleft"
-     left_delta="5"
-     name="logfile_name_datestamp"
-     top_pad="10"
-     width="350"/>
-	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_desc"
-     top_pad="30"
-     width="128">
-        Location of logs:
-    </text>    
-    <line_editor
-     bottom="366"
-     control_name="InstantMessageLogPath"
-     follows="top|left|right"
-     halign="right"
-     height="23"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_string"
-     top_pad="5"
-     width="250"/>
-    <button
-	 enabled="false"
-     follows="right|bottom"
-     height="23"
-     label="Browse"
-     label_selected="Browse"
-     layout="topleft"
-     left_pad="5"
-     name="log_path_button"
-     top_delta="0"
-     width="145">
-        <button.commit_callback
-         function="Pref.LogPath" />
-    </button>
+
     <button
      follows="left|bottom"
      height="23"
-- 
cgit v1.2.3


From 564f11679d52a777b992c25bbff7e4f914dac7ad Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Fri, 25 Jan 2013 23:29:09 +0000
Subject: [MAINT-2233] Duplicate entries in notifications.xml - Removed
 duplicate notification elements

---
 .../newview/skins/default/xui/en/notifications.xml | 1738 --------------------
 1 file changed, 1738 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 44c18c2cce..c8f5cbb2b0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8872,14 +8872,6 @@ Cannot save to object contents: Item with that name already exists in inventory
 Cannot save to object contents: This would modify the attachment permissions.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to edit this!
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="TooManyScripts"
@@ -8920,47 +8912,6 @@ This region does not have physics shapes enabled.
 You cannot modify the navmesh across region boundaries.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermModifyObject"
-   type="notify">
-   <tag>fail</tag>
-You don't have permission to modify that object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysObjContributesToNav"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for an object that contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysKeyframedObj"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for keyframed objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysNotEnoughLandResources"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object -- insufficient land resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysCostTooGreat"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="NoSetPhysicsPropertiesOnObjectType"
@@ -9987,1693 +9938,4 @@ An internal error prevented us from properly updating your viewer.  The L$ balan
 Cannot create large prims that intersect other players.  Please re-try when other players have moved.
   </notification>
 
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFrozen"
-   type="notify">
-   <tag>fail</tag>
-[AV_FREEZER] has frozen you. You cannot move or interact with the world.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFrozenDuration"
-   type="notify">
-   <tag>fail</tag>
-[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="YouFrozeAvatar"
-   type="notify">
-   <tag>fail</tag>
-Avatar frozen.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarHasUnFrozenYou"
-   type="notify">
-   <tag>fail</tag>
-[AV_FREEZER] has unfrozen you.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarUnFrozen"
-   type="notify">
-   <tag>fail</tag>
-Avatar unfrozen.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFreezeFailure"
-   type="notify">
-   <tag>fail</tag>
-Freeze failed because you don't have admin permission for that parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFreezeThaw"
-   type="notify">
-   <tag>fail</tag>
-Your freeze expired, go about your business.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarCantFreeze"
-   type="notify">
-   <tag>fail</tag>
-Sorry, can't freeze that user.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NowOwnObject"
-   type="notify">
-   <tag>fail</tag>
-You are now the owner of object [OBJECT_NAME]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRezOnLand"
-   type="notify">
-   <tag>fail</tag>
-Can't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezFailTooManyRequests"
-   type="notify">
-   <tag>fail</tag>
-Object can not be rezzed because there are too many requests.
-  </notification>
- 
-  <notification
-   icon="alertmodal.tga"
-   name="SitFailCantMove"
-   type="notify">
-   <tag>fail</tag>
-You cannot sit because you cannot move at this time.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SitFailNotAllowedOnLand"
-   type="notify">
-   <tag>fail</tag>
-You cannot sit because you are not allowed on that land.
-  </notification>
- 
-  <notification
-   icon="alertmodal.tga"
-   name="SitFailNotSameRegion"
-   type="notify">
-   <tag>fail</tag>
-Try moving closer.  Can't sit on object because
-it is not in the same region as you.
-  </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="NoNewObjectRegionFull"
-   type="notify">
-   <tag>fail</tag>
-Unable to create new object. The region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedToPlaceObject"
-   type="notify">
-   <tag>fail</tag>
-Failed to place object at specified location.  Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoOwnNoGardening"
-   type="notify">
-   <tag>fail</tag>
-You Can't create trees and grass on land you don't own.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCopyPermsNoObject"
-   type="notify">
-   <tag>fail</tag>
-Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoTransPermsNoObject"
-   type="notify">
-   <tag>fail</tag>
-Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AddToNavMeshNoCopy"
-   type="notify">
-   <tag>fail</tag>
-Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DupeWithNoRootsSelected"
-   type="notify">
-   <tag>fail</tag>
-Duplicate with no root objects selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDupeCuzRegionIsFull"
-   type="notify">
-   <tag>fail</tag>
-Can't duplicate objects because the region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDupeCuzParcelNotFound"
-   type="notify">
-   <tag>fail</tag>
-Can't duplicate objects - Can't find the parcel they are on.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateCuzParcelFull"
-   type="notify">
-   <tag>fail</tag>
-Can't create object because 
-the parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezAttemptFailed"
-   type="notify">
-   <tag>fail</tag>
-Attempt to rez an object failed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ToxicInvRezAttemptFailed"
-   type="notify">
-   <tag>fail</tag>
-Unable to create item that has caused problems on this region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvItemIsBlacklisted"
-   type="notify">
-   <tag>fail</tag>
-That inventory item has been blacklisted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCanRezObjects"
-   type="notify">
-   <tag>fail</tag>
-You are not currently allowed to create objects.
-  </notification>
- 
-  <notification
-   icon="alertmodal.tga"
-   name="LandSearchBlocked"
-   type="notify">
-   <tag>fail</tag>
-Land Search Blocked.
-You have performed too many land searches too quickly.
-Please try again in a minute.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NotEnoughResourcesToAttach"
-   type="notify">
-   <tag>fail</tag>
-Not enough script resources available to attach object!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="YouDiedAndGotTPHome"
-   type="notify">
-   <tag>fail</tag>
-You died and have been teleported to your home location
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EjectComingSoon"
-   type="notify">
-   <tag>fail</tag>
-You are no longer allowed here and have [EJECT_TIME] seconds to leave.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoEnterServerFull"
-   type="notify">
-   <tag>fail</tag>
-You can't enter this region because 
-the server is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveBackToInvDisabled"
-   type="notify">
-   <tag>fail</tag>
-Save Back To Inventory has been disabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoExistNoSaveToContents"
-   type="notify">
-   <tag>fail</tag>
-Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNoSaveToContents"
-   type="notify">
-   <tag>fail</tag>
-Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSaveBackToInvDisabled"
-   type="notify">
-   <tag>fail</tag>
-Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCopyNoSelCopy"
-   type="notify">
-   <tag>fail</tag>
-You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoTransNoSelCopy"
-   type="notify">
-   <tag>fail</tag>
-You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoTransNoCopy"
-   type="notify">
-   <tag>fail</tag>
-You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermsNoRemoval"
-   type="notify">
-   <tag>fail</tag>
-Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNoSaveSelection"
-   type="notify">
-   <tag>fail</tag>
-Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCopyNoSaveSelection"
-   type="notify">
-   <tag>fail</tag>
-Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNoTaking"
-   type="notify">
-   <tag>fail</tag>
-You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezDestInternalError"
-   type="notify">
-   <tag>fail</tag>
-Internal Error: Unknown destination type.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeleteFailObjNotFound"
-   type="notify">
-   <tag>fail</tag>
-Delete failed because object not found
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SorryCantEjectUser"
-   type="notify">
-   <tag>fail</tag>
-Sorry, can't eject that user.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionSezNotAHome"
-   type="notify">
-   <tag>fail</tag>
-This region does not allow you to set your home location here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HomeLocationLimits"
-   type="notify">
-   <tag>fail</tag>
-You can only set your 'Home Location' on your land or at a mainland Infohub.
-   </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HomePositionSet"
-   type="notify">
-   <tag>fail</tag>
-Home position set.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarEjected"
-   type="notify">
-   <tag>fail</tag>
-Avatar ejected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarEjectFailed"
-   type="notify">
-   <tag>fail</tag>
-Eject failed because you don't have admin permission for that parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectParcelFull"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectParcelPerms"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectParcelResources"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectRegionVersion"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectNavMesh"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectWTF"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermModifyObject"
-   type="notify">
-   <tag>fail</tag>
-You don't have permission to modify that object
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysObjContributesToNav"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for an object that contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysKeyframedObj"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for keyframed objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysNotEnoughLandResources"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object -- insufficient land resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysCostTooGreat"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PhantomWithConcavePiece"
-   type="notify">
-   <tag>fail</tag>
-This object cannot have a concave piece because it is phantom and contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableAddItem"
-   type="notify">
-   <tag>fail</tag>
-Unable to add item!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableEditItem"
-   type="notify">
-   <tag>fail</tag>
-Unable to edit this!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to edit this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToCopyInventory"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to copy that inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSaveItemDoesntExist"
-   type="notify">
-   <tag>fail</tag>
-Cannot save to object contents: Item no longer exists.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSaveItemAlreadyExists"
-   type="notify">
-   <tag>fail</tag>
-Cannot save to object contents: Item with that name already exists in inventory
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSaveModifyAttachment"
-   type="notify">
-   <tag>fail</tag>
-Cannot save to object contents: This would modify the attachment permissions.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to edit this!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TooManyScripts"
-   type="notify">
-   <tag>fail</tag>
-Too many scripts.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableAddScript"
-   type="notify">
-   <tag>fail</tag>
-Unable to add script!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AssetServerTimeoutObjReturn"
-   type="notify">
-   <tag>fail</tag>
-Asset server didn't respond in a timely fashion.  Object returned to sim.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionDisablePhysicsShapes"
-   type="notify">
-   <tag>fail</tag>
-This region does not have physics shapes enabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNavmeshAcrossRegions"
-   type="notify">
-   <tag>fail</tag>
-You cannot modify the navmesh across region boundaries.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermModifyObject"
-   type="notify">
-   <tag>fail</tag>
-You don't have permission to modify that object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysObjContributesToNav"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for an object that contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysKeyframedObj"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for keyframed objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysNotEnoughLandResources"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object -- insufficient land resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysCostTooGreat"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSetPhysicsPropertiesOnObjectType"
-   type="notify">
-   <tag>fail</tag>
-Cannot set physics properties on that object type.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSetRootPrimWithNoShape"
-   type="notify">
-   <tag>fail</tag>
-Cannot set root prim to have no shape.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoRegionSupportPhysMats"
-   type="notify">
-   <tag>fail</tag>
-This region does not have physics materials enabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OnlyRootPrimPhysMats"
-   type="notify">
-   <tag>fail</tag>
-Only root prims may have their physics materials adjusted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSupportCharacterPhysMats"
-   type="notify">
-   <tag>fail</tag>
-Setting physics materials on characters is not yet supported.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidPhysMatProperty"
-   type="notify">
-   <tag>fail</tag>
-One or more of the specified physics material properties was invalid.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermsAlterStitchingMeshObj"
-   type="notify">
-   <tag>fail</tag>
-You may not alter the stitching type of a mesh object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermsAlterShapeMeshObj"
-   type="notify">
-   <tag>fail</tag>
-You may not alter the shape of a mesh object
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FullRegionCantEnter"
-   type="notify">
-   <tag>fail</tag>
-You can't enter this region because \nthe region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedOwnersDiffer"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- owners differ
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedNoModNavmeshAcrossRegions"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- cannot modify the navmesh across region boundaries.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedNoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Link failed because you do not have edit permission.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedTooManyPrims"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- too many primitives
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedCantLinkNoCopyNoTrans"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- cannot link no-copy with no-transfer
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedNothingLinkable"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- nothing linkable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedTooManyPathfindingChars"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- too many pathfinding characters
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedInsufficientLand"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- insufficient land resources
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedTooMuchPhysics"
-   type="notify">
-   <tag>fail</tag>
-Object uses too many physics resources -- its dynamics have been disabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedHomeByObjectOnParcel"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedHomeByObject"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported home by the object '[OBJECT_NAME]'
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByAttachment"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by an attachment on [ITEM_ID]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByObjectOnParcel"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByObjectOwnedBy"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByObjectUnknownUser"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObjectRegionFull"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. The region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttackMultipleObjOneSpot"
-   type="notify">
-   <tag>fail</tag>
-You can't attach multiple objects to one spot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateMultipleObjAtLoc"
-   type="notify">
-   <tag>fail</tag>
-You can't create multiple objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateObjTimeOut"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. Object is missing from database.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateObjUnknown"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. The request timed out. Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateObjMissingFromDB"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezFailureTookTooLong"
-   type="notify">
-   <tag>fail</tag>
-Rez failed, requested object took too long to load.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedToPlaceObjAtLoc"
-   type="notify">
-   <tag>fail</tag>
-Failed to place object at specified location.  Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreatePlantsOnLand"
-   type="notify">
-   <tag>fail</tag>
-You cannot create plants on this land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRestoreObjectNoWorldPos"
-   type="notify">
-   <tag>fail</tag>
-Cannot restore object. No world position found.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRezObjectInvalidMeshData"
-   type="notify">
-   <tag>fail</tag>
-Unable to rez object because its mesh data is invalid.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRezObjectTooManyScripts"
-   type="notify">
-   <tag>fail</tag>
-Unable to rez object because there are already too many scripts in this region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObjectNoAccess"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to create objects there.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObject"
-   type="notify">
-   <tag>fail</tag>
-You are not currently allowed to create objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidObjectParams"
-   type="notify">
-   <tag>fail</tag>
-Invalid object parameters
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDuplicateObjectNoAcess"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to duplicate objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantChangeShape"
-   type="notify">
-   <tag>fail</tag>
-You are not allowed to change this shape.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoAccessToClaimObjects"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to claim objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeedFailedNoPermToDeedForGroup"
-   type="notify">
-   <tag>fail</tag>
-Deed failed because you do not have permission to deed objects for your group.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPrivsToBuyObject"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to buy objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachObjectAvatarSittingOnIt"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach object because an avatar is sitting on it.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WhyAreYouTryingToWearShrubbery"
-   type="notify">
-   <tag>fail</tag>
-Trees and grasses cannot be worn as attachments.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachGroupOwnedObjs"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach group-owned objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachObjectsNotOwned"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach objects that you don't own.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachNavmeshObjects"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach objects that contribute to navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachObjectNoMovePermissions"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach object because you do not have permission to move it.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachNotEnoughScriptResources"
-   type="notify">
-   <tag>fail</tag>
-Not enough script resources available to attach object!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropItemTrialUser"
-   type="notify">
-   <tag>fail</tag>
-You can't drop objects here; try the Free Trial area.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropMeshAttachment"
-   type="notify">
-   <tag>fail</tag>
-You can't drop mesh attachments. Detach to inventory and then rez in world.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropAttachmentNoPermission"
-   type="notify">
-   <tag>fail</tag>
-Failed to drop attachment: you don't have permission to drop there.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropAttachmentInsufficientLandResources"
-   type="notify">
-   <tag>fail</tag>
-Failed to drop attachment: insufficient available land resource.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropAttachmentInsufficientResources"
-   type="notify">
-   <tag>fail</tag>
-Failed to drop attachments: insufficient available resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropObjectFullParcel"
-   type="notify">
-   <tag>fail</tag>
-Cannot drop object here.  Parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantTouchObjectBannedFromParcel"
-   type="notify">
-   <tag>fail</tag>
-Can't touch/grab this object because you are banned from the land parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PlzNarrowDeleteParams"
-   type="notify">
-   <tag>fail</tag>
-Please narrow your delete parameters.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToUploadAsset"
-   type="notify">
-   <tag>fail</tag>
-Unable to upload asset.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantTeleportCouldNotFindUser"
-   type="notify">
-   <tag>fail</tag>
-Could not find user to teleport home
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodlikeRequestFailed"
-   type="notify">
-   <tag>fail</tag>
-godlike request failed
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GenericRequestFailed"
-   type="notify">
-   <tag>fail</tag>
-generic request failed
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantUploadPostcard"
-   type="notify">
-   <tag>fail</tag>
-Unable to upload postcard.  Try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantFetchInventoryForGroupNotice"
-   type="notify">
-   <tag>fail</tag>
-Unable to fetch inventory details for the group notice.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSendGroupNoticeNotPermitted"
-   type="notify">
-   <tag>fail</tag>
-Unable to send group notice -- not permitted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSendGroupNoticeCantConstructInventory"
-   type="notify">
-   <tag>fail</tag>
-Unable to send group notice -- could not construct inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantParceInventoryInNotice"
-   type="notify">
-   <tag>fail</tag>
-Unable to parse inventory in notice.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainUploadFailed"
-   type="notify">
-   <tag>fail</tag>
-Terrain upload failed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainFileWritten"
-   type="notify">
-   <tag>fail</tag>
-Terrain file written.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainFileWrittenStartingDownload"
-   type="notify">
-   <tag>fail</tag>
-Terrain file written, starting download...
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainBaked"
-   type="notify">
-   <tag>fail</tag>
-Terrain baked.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TenObjectsDisabledPlzRefresh"
-   type="notify">
-   <tag>fail</tag>
-Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UpdateViewerBuyParcel"
-   type="notify">
-   <tag>fail</tag>
-You need to update your viewer to buy this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandBuyAccessBlocked"
-   type="notify">
-   <tag>fail</tag>
-You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyParcelNotForSale"
-   type="notify">
-   <tag>fail</tag>
-Unable to buy, this parcel is not for sale.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuySalePriceOrLandAreaChanged"
-   type="notify">
-   <tag>fail</tag>
-Unable to buy, the sale price or land area has changed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyParcelNotAuthorized"
-   type="notify">
-   <tag>fail</tag>
-You are not the authorized buyer for this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyParcelAwaitingPurchaseAuth"
-   type="notify">
-   <tag>fail</tag>
-You cannot purchase this parcel because it is already awaiting purchase aut
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuildOverflowParcel"
-   type="notify">
-   <tag>fail</tag>
-You cannot build objects here because doing so would overflow the parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SelectedMultipleOwnedLand"
-   type="notify">
-   <tag>fail</tag>
-You selected land with different owners. Please select a smaller area and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantJoinTooFewLeasedParcels"
-   type="notify">
-   <tag>fail</tag>
-Not enough leased parcels in selection to join.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDivideLandMultipleParcelsSelected"
-   type="notify">
-   <tag>fail</tag>
-Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDivideLandCantFindParcel"
-   type="notify">
-   <tag>fail</tag>
-Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDivideLandWholeParcelSelected"
-   type="notify">
-   <tag>fail</tag>
-Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandHasBeenDivided"
-   type="notify">
-   <tag>fail</tag>
-Land has been divided.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PassPurchased"
-   type="notify">
-   <tag>fail</tag>
-You purchased a pass.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionDisallowsClassifieds"
-   type="notify">
-   <tag>fail</tag>
-Region does not allow classified advertisements.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandPassExpireSoon"
-   type="notify">
-   <tag>fail</tag>
-Your pass to this land is about to expire.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSitNoSuitableSurface"
-   type="notify">
-   <tag>fail</tag>
-There is no suitable surface to sit on, try another spot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSitNoRoom"
-   type="notify">
-   <tag>fail</tag>
-No room to sit here, try another spot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AutopilotCanceled"
-   type="notify">
-   <tag>fail</tag>
-Autopilot canceled
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClaimObjectFailedNoPermission"
-   type="notify">
-   <tag>fail</tag>
-Claim object failed because you don't have permission
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClaimObjectFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-Claim object failed because you don't have enough L$.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDeedGroupLand"
-   type="notify">
-   <tag>fail</tag>
-Cannot deed group-owned land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyObjectFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-Buy object failed because you don't have enough L$.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyInventoryFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-Buy inventory failed because you do not have enough L$
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyPassFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-You don't have enough L$ to buy a pass to this land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyPassTryAgain"
-   type="notify">
-   <tag>fail</tag>
-Unable to buy pass right now.  Try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObjectParcelFull"
-   type="notify">
-   <tag>fail</tag>
-Can't create object because \nthe parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedPlacingObject"
-   type="notify">
-   <tag>fail</tag>
-Failed to place object at specified location.  Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateLandmarkForEvent"
-   type="notify">
-   <tag>fail</tag>
-Unable to create landmark for event.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodBeatsFreeze"
-   type="notify">
-   <tag>fail</tag>
-Your godlike powers break the freeze!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SpecialPowersRequestFailedLogged"
-   type="notify">
-   <tag>fail</tag>
-Request for special powers failed. This request has been logged.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExpireExplanation"
-   type="notify">
-   <tag>fail</tag>
-The system is currently unable to process your request. The request timed out.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DieExplanation"
-   type="notify">
-   <tag>fail</tag>
-The system is unable to process your request.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AddPrimitiveFailure"
-   type="notify">
-   <tag>fail</tag>
-Insufficient funds to create primitve.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezObjectFailure"
-   type="notify">
-   <tag>fail</tag>
-Insufficient funds to create object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ResetHomePositionNotLegal"
-   type="notify">
-   <tag>fail</tag>
-Reset Home position since Home wasn't legal.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantInviteRegionFull"
-   type="notify">
-   <tag>fail</tag>
-You cannot currently invite anyone to your location because the region is full. Try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSetHomeAtRegion"
-   type="notify">
-   <tag>fail</tag>
-This region does not allow you to set your home location here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ListValidHomeLocations"
-   type="notify">
-   <tag>fail</tag>
-You can only set your 'Home Location' on your land or at a mainland Infohub.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetHomePosition"
-   type="notify">
-   <tag>fail</tag>
-Home position set.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDerezInventoryError"
-   type="notify">
-   <tag>fail</tag>
-Cannot derez object due to inventory fault.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateRequestedInv"
-   type="notify">
-   <tag>fail</tag>
-Cannot create requested inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateRequestedInvFolder"
-   type="notify">
-   <tag>fail</tag>
-Cannot create requested inventory folder.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateInventory"
-   type="notify">
-   <tag>fail</tag>
-Cannot create that inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateLandmark"
-   type="notify">
-   <tag>fail</tag>
-Cannot create landmark.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateOutfit"
-   type="notify">
-   <tag>fail</tag>
-Cannot create outfit right now. Try again in a minute.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InventoryNotForSale"
-   type="notify">
-   <tag>fail</tag>
-Inventory is not for sale.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantFindInvItem"
-   type="notify">
-   <tag>fail</tag>
-Unable to find inventory item.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantFindObject"
-   type="notify">
-   <tag>fail</tag>
-Unable to find object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantTransfterMoneyRegionDisabled"
-   type="notify">
-   <tag>fail</tag>
-Money transfers to objects are currently disabled in this region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantPayNoAgent"
-   type="notify">
-   <tag>fail</tag>
-Could not figure out who to pay.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDonateToPublicObjects"
-   type="notify">
-   <tag>fail</tag>
-You cannot give L$ to public objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InventoryCreationInWorldObjectFailed"
-   type="notify">
-   <tag>fail</tag>
-Inventory creation on in-world object failed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UserBalanceOrLandUsageError"
-   type="notify">
-   <tag>fail</tag>
-An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
-  </notification>
-
-
 </notifications>
-- 
cgit v1.2.3


From b8f74b42a7a2d08e9c7a2dcebec58dbd07ec0328 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 25 Jan 2013 17:29:44 -0600
Subject: MAINT-2268 Add right-click->"Mute Particle Owner" feature

---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml | 11 +++++++++++
 indra/newview/skins/default/xui/en/menu_attachment_self.xml  | 11 +++++++++++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml     | 11 +++++++++++
 indra/newview/skins/default/xui/en/menu_avatar_self.xml      | 11 +++++++++++
 indra/newview/skins/default/xui/en/menu_land.xml             | 11 +++++++++++
 indra/newview/skins/default/xui/en/menu_object.xml           | 11 +++++++++++
 6 files changed, 66 insertions(+)

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

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 b46b62ec4d..00d4b1dab1 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -104,4 +104,15 @@
          <menu_item_call.on_enable
           function="Object.EnableInspect" />
    </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
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 b8128da358..73c9e8a9d8 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -135,4 +135,15 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Attachment.EnableDrop" />
   </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
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 276b5f106f..73fa086f28 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -95,4 +95,15 @@
         <menu_item_call.on_enable
          function="EnablePayAvatar" />
     </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
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 d9bdfece38..ed35e5e771 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,15 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index cc6d8ad9c1..7b40e89535 100644
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -61,4 +61,15 @@
         <menu_item_call.on_enable
          function="EnableEdit" />
     </menu_item_call>
+   <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index f6004621a6..97b24d2aba 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -196,4 +196,15 @@
     <menu_item_call.on_enable
         function="Object.EnableDelete" />
   </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 9f046e6b3fb225a11e86b9b07bc80efe1c5abca1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 25 Jan 2013 17:30:01 -0600
Subject: MAINT-2268 Add right-click->"Mute Particle Owner" feature

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_mute_particle.xml b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
new file mode 100644
index 0000000000..41d5613623
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu
+ layout="topleft"
+ name="Mute Particle Pie">
+  <menu_item_call
+     enabled="false"
+     label="Mute Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From 2ce44afc7f69ddf92b857c8999e255c528d2f393 Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Sat, 26 Jan 2013 01:47:37 +0000
Subject: [MAINT-2233] Duplicate entries in notifications.xml - Removed
 duplicate entry from panel_preferences_general.xml

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

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

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 849f3ef73d..7eb0fac2be 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -152,19 +152,6 @@
      width="80">
         Mid
     </text>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left_delta="87"
-     name="ShadersPrefText3"
-     top_delta="0"
-     width="80">
-      High
-  </text>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 6c667b8c3372505b17385efaac7c0e758b29a1a7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 28 Jan 2013 16:20:52 -0500
Subject: rename "Lighting and Shadows" (deferred rendering) to "Advanced
 Lighting Model"

---
 indra/newview/skins/default/xui/da/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml                 | 4 ++--
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/pl/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/ru/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/tr/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml                 | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index d695cd1f89..f2ed7c2e64 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -245,7 +245,7 @@
 		<menu label="Gengivelse" name="Rendering">
 			<menu_item_check label="Akser" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Lys og skygger" name="Lighting and Shadows"/>
+			<menu_item_check label="Lys og skygger" name="Advanced Lighting Model"/>
 			<menu_item_check label="Skygger fra sol/måne/andre lyskilder" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO og skygge udjævning" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Globalt lys (eksperimentiel)" name="Global Illumination"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 845df1f050..8277174cda 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -307,7 +307,7 @@
 			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
 			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Licht und Schatten" name="Lighting and Shadows"/>
+			<menu_item_check label="Licht und Schatten" name="Advanced Lighting Model"/>
 			<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index bbcf7bc3ef..7e21013cac 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2584,8 +2584,8 @@
           <menu_item_separator />
 
           <menu_item_check
-                       label="Lighting and Shadows"
-                       name="Lighting and Shadows">
+                       label="Advanced Lighting Model"
+                       name="Advanced Lighting Model">
             <menu_item_check.on_check
              function="CheckControl"
              parameter="RenderDeferred" />
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 849f3ef73d..e249d51d91 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -262,7 +262,7 @@
 		 control_name="RenderDeferred"
 		 height="16"
 		 initial_value="true"
-		 label="Lighting and Shadows"
+		 label="Advance Lighting Model"
 		 layout="topleft"
 		 left_delta="0"
 		 name="UseLightShaders"
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index d80150ef6d..9e0ac5115f 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -285,7 +285,7 @@
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luces y sombras" name="Lighting and Shadows"/>
+			<menu_item_check label="Luces y sombras" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras del sol/la luna/proyectores" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO y sombras suavizadas" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Capas alfa automáticas (deferidas)" name="Automatic Alpha Masks (deferred)"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 85020afe25..24bd6a2a95 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -307,7 +307,7 @@
 			<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Filaire" name="Wireframe"/>
 			<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
-			<menu_item_check label="Éclairage et ombres" name="Lighting and Shadows"/>
+			<menu_item_check label="Éclairage et ombres" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Débogage GL" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 547c5a9b73..cdfa97bb3c 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -286,7 +286,7 @@
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luci e ombre" name="Lighting and Shadows"/>
+			<menu_item_check label="Luci e ombre" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombra dal sole, dalla luna e dai proiettori" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e ombre fluide" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Maschera alfa automatica (differita)" name="Automatic Alpha Masks (deferred)"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index e60e6781c6..74859076c2 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -307,7 +307,7 @@
 			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
 			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
 			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="光と影" name="Lighting and Shadows"/>
+			<menu_item_check label="光と影" name="Advanced Lighting Model"/>
 			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL デバッグ" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 24c961fa26..e1725fc308 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -236,7 +236,7 @@
 		<menu label="Renderowanie" name="Rendering">
 			<menu_item_check label="Osie" name="Axes"/>
 			<menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe"/>
-			<menu_item_check label="Oświetlenie i cienie" name="Lighting and Shadows"/>
+			<menu_item_check label="Oświetlenie i cienie" name="Advanced Lighting Model"/>
 			<menu_item_check label="Cienie Słońca/Księżyca/Projektory" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO and wygładzanie cienia" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Globalne oświetlenie (eksperymentalne)" name="Global Illumination"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index ca378c1b58..e8baff5af2 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -286,7 +286,7 @@
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Iluminação e sombras" name="Lighting and Shadows"/>
+			<menu_item_check label="Iluminação e sombras" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras da projeção do sol/lua" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e sombra suave" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Máscaras alpha automáticas (adiadas)" name="Automatic Alpha Masks (deferred)"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d9425937c3..c292b8a287 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -305,7 +305,7 @@
 			<menu_item_call label="Выбранная текстура в основе" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Каркас" name="Wireframe"/>
 			<menu_item_check label="Смыкание объектов" name="Object-Object Occlusion"/>
-			<menu_item_check label="Освещение и тени" name="Lighting and Shadows"/>
+			<menu_item_check label="Освещение и тени" name="Advanced Lighting Model"/>
 			<menu_item_check label="Тени от солнца, луны и прожекторов" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO и сглаживание теней" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Отладка GL" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 7a7faf6ac4..28f28db6d2 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -305,7 +305,7 @@
 			<menu_item_call label="Seçilen Doku Bilgi Temeli" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Telkafes" name="Wireframe"/>
 			<menu_item_check label="Görünen Nesneler İçin Gölgeleme" name="Object-Object Occlusion"/>
-			<menu_item_check label="Işıklandırma ve Gölgeler" name="Lighting and Shadows"/>
+			<menu_item_check label="Işıklandırma ve Gölgeler" name="Advanced Lighting Model"/>
 			<menu_item_check label="Güneş/Ay/Projektörlerden Gelen Gölgeler" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO ve Gölge Yumuşatma" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL Hata Ayıklama" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ac0e9e7e35..9a95e8c4d6 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -305,7 +305,7 @@
 			<menu_item_call label="已選取材質資訊基礎" name="Selected Texture Info Basis"/>
 			<menu_item_check label="線框" name="Wireframe"/>
 			<menu_item_check label="物件導向的遮蔽" name="Object-Object Occlusion"/>
-			<menu_item_check label="光線和陰影" name="Lighting and Shadows"/>
+			<menu_item_check label="光線和陰影" name="Advanced Lighting Model"/>
 			<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL 除錯" name="Debug GL"/>
-- 
cgit v1.2.3


From 1751c965ba1ffd1a89a3b94542624e70cbde1060 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Tue, 29 Jan 2013 21:19:58 -0600
Subject: Editing interface for normal and specular maps and other parameters.

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 136 ++++++++++++++++++++-
 1 file changed, 134 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 21cbf9673d..8382ad69d1 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -200,10 +200,12 @@
                 Mask cutoff
             </text>
             <spinner
-             decimal_digits="3"
+             decimal_digits="0"
+             min_val="0"
+             max_val="255"
              follows="left|top"
              height="19"
-             initial_value="0"
+             initial_value="55"
              layout="topleft"
              top_pad="4"
              left_delta="0"
@@ -388,6 +390,8 @@
             </text>
             <spinner
              decimal_digits="3"
+             min_value="0"
+             max_value="1"
              follows="left|top"
              height="19"
              initial_value="0"
@@ -411,6 +415,8 @@
             </text>
             <spinner
              decimal_digits="3"
+             min_value="0"
+             max_value="1"
              follows="left|top"
              height="19"
              initial_value="0"
@@ -597,6 +603,132 @@
              min_val="-1"
              name="TexOffsetV"
              width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="bumpyScaleU"
+             top_delta="-115"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="bumpyScaleV"
+             width="265" />
+           <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             top_pad="27"
+             increment="1"
+             initial_value="0"
+			 label="Rotation degrees"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="9999"
+             min_val="-9999"
+             name="bumpyRot"
+             width="265" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="bumpyOffsetU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="bumpyOffsetV"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="shinyScaleU"
+             top_delta="-115"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="shinyScaleV"
+             width="265" />
+           <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             top_pad="27"
+             increment="1"
+             initial_value="0"
+			 label="Rotation degrees"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="9999"
+             min_val="-9999"
+             name="shinyRot"
+             width="265" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="shinyOffsetU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="shinyOffsetV"
+             width="265" />
             <check_box
              follows="top|left"
              height="16"
-- 
cgit v1.2.3


From 8714b610149a5ae7b6f248023722f237c9336472 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Thu, 31 Jan 2013 19:05:15 +0200
Subject: CHUI-719 FIXED Font color was changed.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 4f33699aa6..9b22c8c6dd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -46,8 +46,7 @@
         layout="topleft"
         name="voice_call_friends_only_check"
         top_pad="6"
-        width="350">
-      <check_box.label_text text_color="White" />
+        width="350">     
     </check_box>
 
     <text
@@ -79,8 +78,7 @@
       <item
           label="Large"
           name="Large"
-          value="2"/>
-      <combo_box.drop_down_button label_color="White" />
+          value="2"/>  
     </combo_box>
 
     <check_box
@@ -107,7 +105,6 @@
         height="12"
         name="notifications"
         left="0"
-        text_color="White"
         width="120">
       Notifications
     </text>
@@ -392,14 +389,12 @@
         <item
             label="No log or transcripts"
             value="0"/>
-        <drop_down_button label_color="White" />
     </combo_box>
 
     <button
         enabled="false"
         height="23"
         label="Clear log..."
-        label_color="White"
         layout="topleft"
         left_pad="5"
         top="0"
@@ -413,7 +408,6 @@
         enabled="false"
         height="23"
         label="Delete transcripts..."
-        label_color="White"
         layout="topleft"
         left_pad="5"
         top="0"
@@ -452,7 +446,6 @@
         follows="left|top"
         height="23"
         label="Browse..."
-        label_color="White"
         label_selected="Browse"
         layout="topleft"
         left_pad="5"
-- 
cgit v1.2.3


From 48df050feffc9e70d09e4caae239a55504c40b38 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Thu, 31 Jan 2013 14:44:53 -0800
Subject: sync with viewer-development

---
 .../newview/skins/default/xui/en/notifications.xml | 1738 --------------------
 .../default/xui/en/panel_preferences_graphics1.xml |   13 -
 2 files changed, 1751 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 44c18c2cce..c8f5cbb2b0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8872,14 +8872,6 @@ Cannot save to object contents: Item with that name already exists in inventory
 Cannot save to object contents: This would modify the attachment permissions.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to edit this!
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="TooManyScripts"
@@ -8920,47 +8912,6 @@ This region does not have physics shapes enabled.
 You cannot modify the navmesh across region boundaries.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermModifyObject"
-   type="notify">
-   <tag>fail</tag>
-You don't have permission to modify that object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysObjContributesToNav"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for an object that contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysKeyframedObj"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for keyframed objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysNotEnoughLandResources"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object -- insufficient land resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysCostTooGreat"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="NoSetPhysicsPropertiesOnObjectType"
@@ -9987,1693 +9938,4 @@ An internal error prevented us from properly updating your viewer.  The L$ balan
 Cannot create large prims that intersect other players.  Please re-try when other players have moved.
   </notification>
 
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFrozen"
-   type="notify">
-   <tag>fail</tag>
-[AV_FREEZER] has frozen you. You cannot move or interact with the world.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFrozenDuration"
-   type="notify">
-   <tag>fail</tag>
-[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="YouFrozeAvatar"
-   type="notify">
-   <tag>fail</tag>
-Avatar frozen.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarHasUnFrozenYou"
-   type="notify">
-   <tag>fail</tag>
-[AV_FREEZER] has unfrozen you.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarUnFrozen"
-   type="notify">
-   <tag>fail</tag>
-Avatar unfrozen.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFreezeFailure"
-   type="notify">
-   <tag>fail</tag>
-Freeze failed because you don't have admin permission for that parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarFreezeThaw"
-   type="notify">
-   <tag>fail</tag>
-Your freeze expired, go about your business.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarCantFreeze"
-   type="notify">
-   <tag>fail</tag>
-Sorry, can't freeze that user.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NowOwnObject"
-   type="notify">
-   <tag>fail</tag>
-You are now the owner of object [OBJECT_NAME]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRezOnLand"
-   type="notify">
-   <tag>fail</tag>
-Can't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezFailTooManyRequests"
-   type="notify">
-   <tag>fail</tag>
-Object can not be rezzed because there are too many requests.
-  </notification>
- 
-  <notification
-   icon="alertmodal.tga"
-   name="SitFailCantMove"
-   type="notify">
-   <tag>fail</tag>
-You cannot sit because you cannot move at this time.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SitFailNotAllowedOnLand"
-   type="notify">
-   <tag>fail</tag>
-You cannot sit because you are not allowed on that land.
-  </notification>
- 
-  <notification
-   icon="alertmodal.tga"
-   name="SitFailNotSameRegion"
-   type="notify">
-   <tag>fail</tag>
-Try moving closer.  Can't sit on object because
-it is not in the same region as you.
-  </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="NoNewObjectRegionFull"
-   type="notify">
-   <tag>fail</tag>
-Unable to create new object. The region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedToPlaceObject"
-   type="notify">
-   <tag>fail</tag>
-Failed to place object at specified location.  Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoOwnNoGardening"
-   type="notify">
-   <tag>fail</tag>
-You Can't create trees and grass on land you don't own.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCopyPermsNoObject"
-   type="notify">
-   <tag>fail</tag>
-Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoTransPermsNoObject"
-   type="notify">
-   <tag>fail</tag>
-Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AddToNavMeshNoCopy"
-   type="notify">
-   <tag>fail</tag>
-Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DupeWithNoRootsSelected"
-   type="notify">
-   <tag>fail</tag>
-Duplicate with no root objects selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDupeCuzRegionIsFull"
-   type="notify">
-   <tag>fail</tag>
-Can't duplicate objects because the region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDupeCuzParcelNotFound"
-   type="notify">
-   <tag>fail</tag>
-Can't duplicate objects - Can't find the parcel they are on.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateCuzParcelFull"
-   type="notify">
-   <tag>fail</tag>
-Can't create object because 
-the parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezAttemptFailed"
-   type="notify">
-   <tag>fail</tag>
-Attempt to rez an object failed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ToxicInvRezAttemptFailed"
-   type="notify">
-   <tag>fail</tag>
-Unable to create item that has caused problems on this region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvItemIsBlacklisted"
-   type="notify">
-   <tag>fail</tag>
-That inventory item has been blacklisted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCanRezObjects"
-   type="notify">
-   <tag>fail</tag>
-You are not currently allowed to create objects.
-  </notification>
- 
-  <notification
-   icon="alertmodal.tga"
-   name="LandSearchBlocked"
-   type="notify">
-   <tag>fail</tag>
-Land Search Blocked.
-You have performed too many land searches too quickly.
-Please try again in a minute.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NotEnoughResourcesToAttach"
-   type="notify">
-   <tag>fail</tag>
-Not enough script resources available to attach object!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="YouDiedAndGotTPHome"
-   type="notify">
-   <tag>fail</tag>
-You died and have been teleported to your home location
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EjectComingSoon"
-   type="notify">
-   <tag>fail</tag>
-You are no longer allowed here and have [EJECT_TIME] seconds to leave.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoEnterServerFull"
-   type="notify">
-   <tag>fail</tag>
-You can't enter this region because 
-the server is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveBackToInvDisabled"
-   type="notify">
-   <tag>fail</tag>
-Save Back To Inventory has been disabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoExistNoSaveToContents"
-   type="notify">
-   <tag>fail</tag>
-Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNoSaveToContents"
-   type="notify">
-   <tag>fail</tag>
-Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSaveBackToInvDisabled"
-   type="notify">
-   <tag>fail</tag>
-Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCopyNoSelCopy"
-   type="notify">
-   <tag>fail</tag>
-You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoTransNoSelCopy"
-   type="notify">
-   <tag>fail</tag>
-You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoTransNoCopy"
-   type="notify">
-   <tag>fail</tag>
-You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermsNoRemoval"
-   type="notify">
-   <tag>fail</tag>
-Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNoSaveSelection"
-   type="notify">
-   <tag>fail</tag>
-Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoCopyNoSaveSelection"
-   type="notify">
-   <tag>fail</tag>
-Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNoTaking"
-   type="notify">
-   <tag>fail</tag>
-You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezDestInternalError"
-   type="notify">
-   <tag>fail</tag>
-Internal Error: Unknown destination type.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeleteFailObjNotFound"
-   type="notify">
-   <tag>fail</tag>
-Delete failed because object not found
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SorryCantEjectUser"
-   type="notify">
-   <tag>fail</tag>
-Sorry, can't eject that user.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionSezNotAHome"
-   type="notify">
-   <tag>fail</tag>
-This region does not allow you to set your home location here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HomeLocationLimits"
-   type="notify">
-   <tag>fail</tag>
-You can only set your 'Home Location' on your land or at a mainland Infohub.
-   </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HomePositionSet"
-   type="notify">
-   <tag>fail</tag>
-Home position set.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarEjected"
-   type="notify">
-   <tag>fail</tag>
-Avatar ejected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarEjectFailed"
-   type="notify">
-   <tag>fail</tag>
-Eject failed because you don't have admin permission for that parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectParcelFull"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectParcelPerms"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectParcelResources"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectRegionVersion"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectNavMesh"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantMoveObjectWTF"
-   type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermModifyObject"
-   type="notify">
-   <tag>fail</tag>
-You don't have permission to modify that object
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysObjContributesToNav"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for an object that contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysKeyframedObj"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for keyframed objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysNotEnoughLandResources"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object -- insufficient land resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysCostTooGreat"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PhantomWithConcavePiece"
-   type="notify">
-   <tag>fail</tag>
-This object cannot have a concave piece because it is phantom and contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableAddItem"
-   type="notify">
-   <tag>fail</tag>
-Unable to add item!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableEditItem"
-   type="notify">
-   <tag>fail</tag>
-Unable to edit this!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to edit this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToCopyInventory"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to copy that inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSaveItemDoesntExist"
-   type="notify">
-   <tag>fail</tag>
-Cannot save to object contents: Item no longer exists.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSaveItemAlreadyExists"
-   type="notify">
-   <tag>fail</tag>
-Cannot save to object contents: Item with that name already exists in inventory
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSaveModifyAttachment"
-   type="notify">
-   <tag>fail</tag>
-Cannot save to object contents: This would modify the attachment permissions.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Not permitted to edit this!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TooManyScripts"
-   type="notify">
-   <tag>fail</tag>
-Too many scripts.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableAddScript"
-   type="notify">
-   <tag>fail</tag>
-Unable to add script!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AssetServerTimeoutObjReturn"
-   type="notify">
-   <tag>fail</tag>
-Asset server didn't respond in a timely fashion.  Object returned to sim.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionDisablePhysicsShapes"
-   type="notify">
-   <tag>fail</tag>
-This region does not have physics shapes enabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoModNavmeshAcrossRegions"
-   type="notify">
-   <tag>fail</tag>
-You cannot modify the navmesh across region boundaries.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermModifyObject"
-   type="notify">
-   <tag>fail</tag>
-You don't have permission to modify that object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysObjContributesToNav"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for an object that contributes to the navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysKeyframedObj"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for keyframed objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysNotEnoughLandResources"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object -- insufficient land resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantEnablePhysCostTooGreat"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSetPhysicsPropertiesOnObjectType"
-   type="notify">
-   <tag>fail</tag>
-Cannot set physics properties on that object type.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSetRootPrimWithNoShape"
-   type="notify">
-   <tag>fail</tag>
-Cannot set root prim to have no shape.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoRegionSupportPhysMats"
-   type="notify">
-   <tag>fail</tag>
-This region does not have physics materials enabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OnlyRootPrimPhysMats"
-   type="notify">
-   <tag>fail</tag>
-Only root prims may have their physics materials adjusted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoSupportCharacterPhysMats"
-   type="notify">
-   <tag>fail</tag>
-Setting physics materials on characters is not yet supported.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidPhysMatProperty"
-   type="notify">
-   <tag>fail</tag>
-One or more of the specified physics material properties was invalid.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermsAlterStitchingMeshObj"
-   type="notify">
-   <tag>fail</tag>
-You may not alter the stitching type of a mesh object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPermsAlterShapeMeshObj"
-   type="notify">
-   <tag>fail</tag>
-You may not alter the shape of a mesh object
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FullRegionCantEnter"
-   type="notify">
-   <tag>fail</tag>
-You can't enter this region because \nthe region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedOwnersDiffer"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- owners differ
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedNoModNavmeshAcrossRegions"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- cannot modify the navmesh across region boundaries.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedNoPermToEdit"
-   type="notify">
-   <tag>fail</tag>
-Link failed because you do not have edit permission.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedTooManyPrims"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- too many primitives
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedCantLinkNoCopyNoTrans"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- cannot link no-copy with no-transfer
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedNothingLinkable"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- nothing linkable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedTooManyPathfindingChars"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- too many pathfinding characters
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedInsufficientLand"
-   type="notify">
-   <tag>fail</tag>
-Link failed -- insufficient land resources
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LinkFailedTooMuchPhysics"
-   type="notify">
-   <tag>fail</tag>
-Object uses too many physics resources -- its dynamics have been disabled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedHomeByObjectOnParcel"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedHomeByObject"
-   persist="true"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported home by the object '[OBJECT_NAME]'
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByAttachment"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by an attachment on [ITEM_ID]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByObjectOnParcel"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByObjectOwnedBy"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportedByObjectUnknownUser"
-   type="notify">
-   <tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObjectRegionFull"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. The region is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttackMultipleObjOneSpot"
-   type="notify">
-   <tag>fail</tag>
-You can't attach multiple objects to one spot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateMultipleObjAtLoc"
-   type="notify">
-   <tag>fail</tag>
-You can't create multiple objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateObjTimeOut"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. Object is missing from database.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateObjUnknown"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. The request timed out. Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateObjMissingFromDB"
-   type="notify">
-   <tag>fail</tag>
-Unable to create requested object. Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezFailureTookTooLong"
-   type="notify">
-   <tag>fail</tag>
-Rez failed, requested object took too long to load.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedToPlaceObjAtLoc"
-   type="notify">
-   <tag>fail</tag>
-Failed to place object at specified location.  Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreatePlantsOnLand"
-   type="notify">
-   <tag>fail</tag>
-You cannot create plants on this land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRestoreObjectNoWorldPos"
-   type="notify">
-   <tag>fail</tag>
-Cannot restore object. No world position found.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRezObjectInvalidMeshData"
-   type="notify">
-   <tag>fail</tag>
-Unable to rez object because its mesh data is invalid.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantRezObjectTooManyScripts"
-   type="notify">
-   <tag>fail</tag>
-Unable to rez object because there are already too many scripts in this region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObjectNoAccess"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to create objects there.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObject"
-   type="notify">
-   <tag>fail</tag>
-You are not currently allowed to create objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidObjectParams"
-   type="notify">
-   <tag>fail</tag>
-Invalid object parameters
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDuplicateObjectNoAcess"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to duplicate objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantChangeShape"
-   type="notify">
-   <tag>fail</tag>
-You are not allowed to change this shape.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoAccessToClaimObjects"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to claim objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeedFailedNoPermToDeedForGroup"
-   type="notify">
-   <tag>fail</tag>
-Deed failed because you do not have permission to deed objects for your group.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoPrivsToBuyObject"
-   type="notify">
-   <tag>fail</tag>
-Your access privileges don't allow you to buy objects here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachObjectAvatarSittingOnIt"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach object because an avatar is sitting on it.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WhyAreYouTryingToWearShrubbery"
-   type="notify">
-   <tag>fail</tag>
-Trees and grasses cannot be worn as attachments.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachGroupOwnedObjs"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach group-owned objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachObjectsNotOwned"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach objects that you don't own.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachNavmeshObjects"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach objects that contribute to navmesh.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachObjectNoMovePermissions"
-   type="notify">
-   <tag>fail</tag>
-Cannot attach object because you do not have permission to move it.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantAttachNotEnoughScriptResources"
-   type="notify">
-   <tag>fail</tag>
-Not enough script resources available to attach object!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropItemTrialUser"
-   type="notify">
-   <tag>fail</tag>
-You can't drop objects here; try the Free Trial area.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropMeshAttachment"
-   type="notify">
-   <tag>fail</tag>
-You can't drop mesh attachments. Detach to inventory and then rez in world.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropAttachmentNoPermission"
-   type="notify">
-   <tag>fail</tag>
-Failed to drop attachment: you don't have permission to drop there.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropAttachmentInsufficientLandResources"
-   type="notify">
-   <tag>fail</tag>
-Failed to drop attachment: insufficient available land resource.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropAttachmentInsufficientResources"
-   type="notify">
-   <tag>fail</tag>
-Failed to drop attachments: insufficient available resources.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDropObjectFullParcel"
-   type="notify">
-   <tag>fail</tag>
-Cannot drop object here.  Parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantTouchObjectBannedFromParcel"
-   type="notify">
-   <tag>fail</tag>
-Can't touch/grab this object because you are banned from the land parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PlzNarrowDeleteParams"
-   type="notify">
-   <tag>fail</tag>
-Please narrow your delete parameters.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToUploadAsset"
-   type="notify">
-   <tag>fail</tag>
-Unable to upload asset.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantTeleportCouldNotFindUser"
-   type="notify">
-   <tag>fail</tag>
-Could not find user to teleport home
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodlikeRequestFailed"
-   type="notify">
-   <tag>fail</tag>
-godlike request failed
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GenericRequestFailed"
-   type="notify">
-   <tag>fail</tag>
-generic request failed
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantUploadPostcard"
-   type="notify">
-   <tag>fail</tag>
-Unable to upload postcard.  Try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantFetchInventoryForGroupNotice"
-   type="notify">
-   <tag>fail</tag>
-Unable to fetch inventory details for the group notice.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSendGroupNoticeNotPermitted"
-   type="notify">
-   <tag>fail</tag>
-Unable to send group notice -- not permitted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSendGroupNoticeCantConstructInventory"
-   type="notify">
-   <tag>fail</tag>
-Unable to send group notice -- could not construct inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantParceInventoryInNotice"
-   type="notify">
-   <tag>fail</tag>
-Unable to parse inventory in notice.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainUploadFailed"
-   type="notify">
-   <tag>fail</tag>
-Terrain upload failed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainFileWritten"
-   type="notify">
-   <tag>fail</tag>
-Terrain file written.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainFileWrittenStartingDownload"
-   type="notify">
-   <tag>fail</tag>
-Terrain file written, starting download...
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TerrainBaked"
-   type="notify">
-   <tag>fail</tag>
-Terrain baked.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TenObjectsDisabledPlzRefresh"
-   type="notify">
-   <tag>fail</tag>
-Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UpdateViewerBuyParcel"
-   type="notify">
-   <tag>fail</tag>
-You need to update your viewer to buy this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandBuyAccessBlocked"
-   type="notify">
-   <tag>fail</tag>
-You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyParcelNotForSale"
-   type="notify">
-   <tag>fail</tag>
-Unable to buy, this parcel is not for sale.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuySalePriceOrLandAreaChanged"
-   type="notify">
-   <tag>fail</tag>
-Unable to buy, the sale price or land area has changed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyParcelNotAuthorized"
-   type="notify">
-   <tag>fail</tag>
-You are not the authorized buyer for this parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyParcelAwaitingPurchaseAuth"
-   type="notify">
-   <tag>fail</tag>
-You cannot purchase this parcel because it is already awaiting purchase aut
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuildOverflowParcel"
-   type="notify">
-   <tag>fail</tag>
-You cannot build objects here because doing so would overflow the parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SelectedMultipleOwnedLand"
-   type="notify">
-   <tag>fail</tag>
-You selected land with different owners. Please select a smaller area and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantJoinTooFewLeasedParcels"
-   type="notify">
-   <tag>fail</tag>
-Not enough leased parcels in selection to join.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDivideLandMultipleParcelsSelected"
-   type="notify">
-   <tag>fail</tag>
-Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDivideLandCantFindParcel"
-   type="notify">
-   <tag>fail</tag>
-Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDivideLandWholeParcelSelected"
-   type="notify">
-   <tag>fail</tag>
-Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandHasBeenDivided"
-   type="notify">
-   <tag>fail</tag>
-Land has been divided.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PassPurchased"
-   type="notify">
-   <tag>fail</tag>
-You purchased a pass.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionDisallowsClassifieds"
-   type="notify">
-   <tag>fail</tag>
-Region does not allow classified advertisements.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandPassExpireSoon"
-   type="notify">
-   <tag>fail</tag>
-Your pass to this land is about to expire.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSitNoSuitableSurface"
-   type="notify">
-   <tag>fail</tag>
-There is no suitable surface to sit on, try another spot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSitNoRoom"
-   type="notify">
-   <tag>fail</tag>
-No room to sit here, try another spot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AutopilotCanceled"
-   type="notify">
-   <tag>fail</tag>
-Autopilot canceled
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClaimObjectFailedNoPermission"
-   type="notify">
-   <tag>fail</tag>
-Claim object failed because you don't have permission
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClaimObjectFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-Claim object failed because you don't have enough L$.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDeedGroupLand"
-   type="notify">
-   <tag>fail</tag>
-Cannot deed group-owned land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyObjectFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-Buy object failed because you don't have enough L$.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyInventoryFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-Buy inventory failed because you do not have enough L$
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyPassFailedNoMoney"
-   type="notify">
-   <tag>fail</tag>
-You don't have enough L$ to buy a pass to this land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyPassTryAgain"
-   type="notify">
-   <tag>fail</tag>
-Unable to buy pass right now.  Try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateObjectParcelFull"
-   type="notify">
-   <tag>fail</tag>
-Can't create object because \nthe parcel is full.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedPlacingObject"
-   type="notify">
-   <tag>fail</tag>
-Failed to place object at specified location.  Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateLandmarkForEvent"
-   type="notify">
-   <tag>fail</tag>
-Unable to create landmark for event.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodBeatsFreeze"
-   type="notify">
-   <tag>fail</tag>
-Your godlike powers break the freeze!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SpecialPowersRequestFailedLogged"
-   type="notify">
-   <tag>fail</tag>
-Request for special powers failed. This request has been logged.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExpireExplanation"
-   type="notify">
-   <tag>fail</tag>
-The system is currently unable to process your request. The request timed out.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DieExplanation"
-   type="notify">
-   <tag>fail</tag>
-The system is unable to process your request.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AddPrimitiveFailure"
-   type="notify">
-   <tag>fail</tag>
-Insufficient funds to create primitve.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RezObjectFailure"
-   type="notify">
-   <tag>fail</tag>
-Insufficient funds to create object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ResetHomePositionNotLegal"
-   type="notify">
-   <tag>fail</tag>
-Reset Home position since Home wasn't legal.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantInviteRegionFull"
-   type="notify">
-   <tag>fail</tag>
-You cannot currently invite anyone to your location because the region is full. Try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSetHomeAtRegion"
-   type="notify">
-   <tag>fail</tag>
-This region does not allow you to set your home location here.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ListValidHomeLocations"
-   type="notify">
-   <tag>fail</tag>
-You can only set your 'Home Location' on your land or at a mainland Infohub.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetHomePosition"
-   type="notify">
-   <tag>fail</tag>
-Home position set.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDerezInventoryError"
-   type="notify">
-   <tag>fail</tag>
-Cannot derez object due to inventory fault.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateRequestedInv"
-   type="notify">
-   <tag>fail</tag>
-Cannot create requested inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateRequestedInvFolder"
-   type="notify">
-   <tag>fail</tag>
-Cannot create requested inventory folder.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateInventory"
-   type="notify">
-   <tag>fail</tag>
-Cannot create that inventory.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateLandmark"
-   type="notify">
-   <tag>fail</tag>
-Cannot create landmark.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantCreateOutfit"
-   type="notify">
-   <tag>fail</tag>
-Cannot create outfit right now. Try again in a minute.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InventoryNotForSale"
-   type="notify">
-   <tag>fail</tag>
-Inventory is not for sale.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantFindInvItem"
-   type="notify">
-   <tag>fail</tag>
-Unable to find inventory item.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantFindObject"
-   type="notify">
-   <tag>fail</tag>
-Unable to find object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantTransfterMoneyRegionDisabled"
-   type="notify">
-   <tag>fail</tag>
-Money transfers to objects are currently disabled in this region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantPayNoAgent"
-   type="notify">
-   <tag>fail</tag>
-Could not figure out who to pay.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantDonateToPublicObjects"
-   type="notify">
-   <tag>fail</tag>
-You cannot give L$ to public objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InventoryCreationInWorldObjectFailed"
-   type="notify">
-   <tag>fail</tag>
-Inventory creation on in-world object failed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UserBalanceOrLandUsageError"
-   type="notify">
-   <tag>fail</tag>
-An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
-  </notification>
-
-
 </notifications>
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 849f3ef73d..7eb0fac2be 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -152,19 +152,6 @@
      width="80">
         Mid
     </text>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left_delta="87"
-     name="ShadersPrefText3"
-     top_delta="0"
-     width="80">
-      High
-  </text>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 0908b60c1cfde9a7cfb131fb0690bd21f8943a57 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Fri, 1 Feb 2013 08:10:16 +0000
Subject: STORM-1930 Quality & Speed slider has Ultra label where High should
 be.

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

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 7eb0fac2be..cd243d40a4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -147,11 +147,24 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText3"
+     name="ShadersPrefText2"
      top_delta="0"
      width="80">
         Mid
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="center"
+     height="12"
+     layout="topleft"
+     left_delta="87"
+     name="ShadersPrefText3"
+     top_delta="0"
+     width="80">
+        High
+    </text>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 85f7f43069ea7ea47b4461fa1d7700339985ab35 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 4 Feb 2013 19:11:17 +0200
Subject: CHUI-695 FIXED Viewer crashes after attempt to accept a friendship in
 IM

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 94c468e1bb..421ecf10a1 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -22,7 +22,7 @@
     background_visible="true"
   bg_alpha_color="ToastBackground"
   bg_opaque_color="ToastBackground"
-    follows="left|right|top"
+    follows="all"
     height="100"
     label="info_panel"
     layout="topleft"
-- 
cgit v1.2.3


From e82da1c8204b34ffe3e5adcad1340dc49e11ef1f Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Mon, 4 Feb 2013 11:50:25 -0800
Subject: MAINT-2326 - New viewer restart notifications appear when logging in
 if not closed before logging out.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8f5cbb2b0..832e05a06f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6683,7 +6683,6 @@ This will add a bookmark in your inventory so you can quickly IM this Resident.
    name="RegionRestartMinutes"
    priority="high"
    sound="UISndAlert"
-   persist="true"
    type="notify">
 This region will restart in [MINUTES] minutes.
 If you stay in this region you will be logged out.
@@ -6694,7 +6693,6 @@ If you stay in this region you will be logged out.
    name="RegionRestartSeconds"
    priority="high"
    sound="UISndAlert"
-   persist="true"
    type="notify">
 This region will restart in [SECONDS] seconds.
 If you stay in this region you will be logged out.
-- 
cgit v1.2.3


From 3781615afa6db7289f26f404885ac614c7f1cee0 Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Wed, 6 Feb 2013 10:03:42 +0200
Subject: CHUI-597 (Messages shown in Conversation Log are inaccurate) Added
 messages, for now they're displayed in two cases: 1) no log entries, logging
 disabled 2) no log entries, logging enabled Case when there are existing log
 entries and logging is disabled is still under discussion

---
 .../newview/skins/default/xui/en/floater_conversation_log.xml |  3 ---
 indra/newview/skins/default/xui/en/strings.xml                | 11 +++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 256e03c4d7..7229292a14 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -13,9 +13,6 @@
  reuse_instance="true"
  title="CONVERSATION LOG"
  width="300">
-  <string name="logging_calls_disabled">
-     Conversations are not being logged. To log conversations in the future, select "Save IM logs on my computer" under Preferences > Privacy.
-  </string>
   <panel
    follows="left|top|right"
    height="32"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d6a2383e52..5aa743b32d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3908,4 +3908,15 @@ Try enclosing path to the editor with double quotes.
   <!-- Spell check settings floater -->
   <string name="UserDictionary">[User]</string>
   
+  <!-- Conversation log messages -->
+  <string name="logging_calls_disabled_log_empty">
+    Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
+  </string>
+  <string name="logging_calls_disabled_log_not_empty">
+    No more conversations will be logged. To resume keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
+  </string>
+  <string name="logging_calls_enabled_log_empty">
+    There are no logged conversations. After you contact someone, or someone contacts you, a log entry will be shown here.
+  </string>
+  
   </strings>
-- 
cgit v1.2.3


From 68a4a8402ccd614f5cdb40cb53efa85166c12598 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 7 Feb 2013 19:39:46 +0200
Subject: CHUI-722 Fixed! Add ? button to titlebar on floaters: Conversation
 Log, Nearby Chat History, and IM History

---
 indra/newview/skins/default/xui/en/floater_conversation_log.xml     | 1 +
 indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 1 +
 2 files changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 7229292a14..19a4cbc119 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -3,6 +3,7 @@
 <floater
  can_resize="true"
  positioning="cascading"
+ help_topic="conversation_log"
  height="200"
  min_height="100"
  min_width="230"
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 6f1ddaaf4f..764b9d8385 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -3,6 +3,7 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
+ help_topic="conversation_preview"
  height="391"
  layout="topleft"
  min_height="243"
-- 
cgit v1.2.3


From 2e2026a4f8359aba26e330fc8ec9ce4a3d40e666 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 8 Feb 2013 20:51:02 -0800
Subject: CHUI-746 : Fixed! Undid the MAINT-2276 hack now that submenus do work
 thanks to CHUI-682

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
index a6e9a40e31..45cf780557 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
@@ -9,5 +9,5 @@
     <menu
      label="New Body Parts"
      layout="topleft"
-     name="COF.Geear.New_Body_Parts" />
+     name="COF.Gear.New_Body_Parts" />
 </toggleable_menu>
-- 
cgit v1.2.3


From a034c272c3d8d526a70998aae7ee816070481c39 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 8 Feb 2013 18:12:26 -0800
Subject: CHUI-747: Script buttons in a toast overlap message text. Problem was
 due to the message container not being shifted upward when buttons were added
 to the control buttons container (which is beneath the message container). A
 small change in CHUI-695 caused this.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 421ecf10a1..94c468e1bb 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -22,7 +22,7 @@
     background_visible="true"
   bg_alpha_color="ToastBackground"
   bg_opaque_color="ToastBackground"
-    follows="all"
+    follows="left|right|top"
     height="100"
     label="info_panel"
     layout="topleft"
-- 
cgit v1.2.3


From 5a92a7700666f40883b72deed8429e7e06164623 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Feb 2013 01:12:47 +0000
Subject: CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle
 mute this participant" Reverted changes in menu_conversation.xml,
 llconversationmodel.cpp, and llfloaterimcontainer.cpp

---
 indra/newview/skins/default/xui/en/menu_conversation.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 46c6e19fa5..8583747da0 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -163,11 +163,18 @@
 		</menu_item_check>
 		<menu_item_separator layout="topleft" name="moderate_voice_separator" />
 		<menu_item_call
-		 label="Toggle mute this participant"
+		 label="Mute this participant"
 		 layout="topleft"
-		 name="ModerateVoiceToggleMuteSelected">
+		 name="ModerateVoiceMuteSelected">
 			<on_click function="Avatar.DoToSelected" parameter="selected" />
-			<on_enable function="Avatar.EnableItem" parameter="can_mute_unmute" />
+      <on_enable function="Avatar.EnableItem" parameter="can_mute" />
+    </menu_item_call>
+    <menu_item_call
+		 label="Unmute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceUnMuteSelected">
+      <on_click function="Avatar.DoToSelected" parameter="selected" />
+      <on_enable function="Avatar.EnableItem" parameter="can_unmute" />
 		</menu_item_call>
 		<menu_item_call
 		 label="Mute everyone"
-- 
cgit v1.2.3


From 649a191c4fd7880e41aff5aae07b31b2a6fa840a Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 13 Feb 2013 00:12:04 +0000
Subject: CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle
 mute this participant" Made mute and unmute invisible instead of disabled
 when not available

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 8583747da0..cbd2343a3c 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -167,14 +167,14 @@
 		 layout="topleft"
 		 name="ModerateVoiceMuteSelected">
 			<on_click function="Avatar.DoToSelected" parameter="selected" />
-      <on_enable function="Avatar.EnableItem" parameter="can_mute" />
+      <on_visible function="Avatar.EnableItem" parameter="can_mute" />
     </menu_item_call>
     <menu_item_call
 		 label="Unmute this participant"
 		 layout="topleft"
 		 name="ModerateVoiceUnMuteSelected">
       <on_click function="Avatar.DoToSelected" parameter="selected" />
-      <on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+      <on_visible function="Avatar.EnableItem" parameter="can_unmute" />
 		</menu_item_call>
 		<menu_item_call
 		 label="Mute everyone"
-- 
cgit v1.2.3


From d818252528aa68a387dc237d1c5a74d366c5a120 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 13 Feb 2013 01:38:24 +0000
Subject: CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle
 mute this participant" Added new
 LLFloaterIMContainer::visibleContextMenuItem() connected to
 "Avatar.VisibleItem"

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index cbd2343a3c..fd5c86b3ca 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -167,14 +167,16 @@
 		 layout="topleft"
 		 name="ModerateVoiceMuteSelected">
 			<on_click function="Avatar.DoToSelected" parameter="selected" />
-      <on_visible function="Avatar.EnableItem" parameter="can_mute" />
+      <on_enable function="Avatar.EnableItem" parameter="can_mute" />
+      <on_visible function="Avatar.VisibleItem" parameter="show_mute" />
     </menu_item_call>
     <menu_item_call
 		 label="Unmute this participant"
 		 layout="topleft"
 		 name="ModerateVoiceUnMuteSelected">
       <on_click function="Avatar.DoToSelected" parameter="selected" />
-      <on_visible function="Avatar.EnableItem" parameter="can_unmute" />
+      <on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+      <on_visible function="Avatar.VisibleItem" parameter="show_unmute" />
 		</menu_item_call>
 		<menu_item_call
 		 label="Mute everyone"
-- 
cgit v1.2.3


From f8e43b6f6682eb613b0dc1f257b47008c09cd7f1 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 13 Feb 2013 15:08:49 +0200
Subject: CHUI-765 FIXED User's name is added to the list in Nearby tab.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 8014e81469..60a6c98514 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -15,6 +15,9 @@
      name="IM">
         <menu_item_call.on_click
          function="Avatar.IM" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_im"/> 
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
@@ -42,6 +45,9 @@
      name="Chat history">
         <menu_item_call.on_click
          function="Avatar.Calllog" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_callog"/>
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call
@@ -70,6 +76,9 @@
      name="Invite">
         <menu_item_call.on_click
          function="Avatar.InviteToGroup" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_invite"/>
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call
@@ -88,6 +97,9 @@
      name="Share">
         <menu_item_call.on_click
          function="Avatar.Share" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_share"/>
     </menu_item_call>
     <menu_item_call
      label="Pay"
@@ -95,6 +107,9 @@
      name="Pay">
         <menu_item_call.on_click
          function="Avatar.Pay" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_pay"/> 
     </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
-- 
cgit v1.2.3


From a9f7c0089fe0a94879e5a9ad31cd6f8b5fb51c36 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 13 Feb 2013 19:12:25 +0200
Subject: CHUI-769 FIXED The text of the dialog is changed.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f8a35337ed..3ae9b206a4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10006,7 +10006,7 @@ Cannot create large prims that intersect other players.  Please re-try when othe
    icon="alertmodal.tga"
    name="PreferenceChatClearLog"
    type="alertmodal">
-    This will delete the log of previous conversations, and all transcripts of those conversations. Proceed?
+    This will delete the log of previous conversations. Proceed?
     <tag>confirm</tag>
     <usetemplate
      ignoretext="Confirm before I delete the log of previous conversations."
@@ -10019,7 +10019,7 @@ Cannot create large prims that intersect other players.  Please re-try when othe
    icon="alertmodal.tga"
    name="PreferenceChatDeleteTranscripts"
    type="alertmodal">
-    This will delete transcripts for all previous conversations. The list of conversations will not be affected. Proceed?
+    This will delete transcripts for all previous conversations. The list of conversations will not be affected. If you run scripts on your chat transcript files, you may want to proceed with caution. Proceed?
     <tag>confirm</tag>
     <usetemplate
      ignoretext="Confirm before I delete transcripts."
-- 
cgit v1.2.3


From e4ea94b62226aebb4408360a033b2c1c71aa4ef6 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 18 Feb 2013 18:56:22 +0200
Subject: CHUI-779 FIXED Chat log preferences are disabled before login.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 9b22c8c6dd..9db3816c92 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -373,6 +373,7 @@
     </text>
 
     <combo_box
+        enabled="false"
         control_name="KeepConversationLogTranscripts"
         height="23"
         layout="topleft"
@@ -428,6 +429,7 @@
     </text>
   
     <line_editor
+    	enabled="false"
         control_name="InstantMessageLogPath"
         border_style="line"
         border_thickness="1"
-- 
cgit v1.2.3


From 4eba77e7db0b60a9d422409521162ef4cd541128 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 20 Feb 2013 01:17:58 +0200
Subject: CHUI-590 FIXED Put voice volume control back into avatar inspector.

---
 .../skins/default/xui/en/inspect_avatar.xml        | 30 ++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index c3481e6d4c..ef4f19cd4c 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -2,14 +2,14 @@
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
--->
+--> 
 <floater
  legacy_header_height="25"
  bevel_style="in"
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="130"
+ height="160"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
@@ -94,6 +94,32 @@
      use_ellipses="true"
      width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
     </text>
+    <slider
+     follows="top|left"
+     height="23"
+     increment="0.01"
+     left="10"
+     max_val="0.95"
+     min_val="0.05"
+     name="volume_slider"
+     show_text="false"
+     tool_tip="Voice volume"
+     top_pad="5"
+     value="0.5"
+     width="200" />
+    <button
+     follows="top|left"
+     height="16"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     left_pad="5"
+     top_delta="4"
+     name="mute_btn"
+     width="16" />
     <text
      follows="top|left"
      height="16"
-- 
cgit v1.2.3


From f67087b87277dc63096fbf4c42cdc17f84d3fbb8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 20 Feb 2013 19:30:46 -0600
Subject: MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that
 automatically visually mutes avatars above a certain threshold (adjusted by
 Avatar Mesh Detail Slider)

---
 .../newview/skins/default/xui/en/notifications.xml | 41 +++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 832e05a06f..fb530ef22d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -202,6 +202,45 @@ Message Template [PATH] not found.
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="ExceededHighDetailRenderCost"
+   persist="false"
+   type="alertmodal">
+    Your avatar has become too complex to be rendered by even high performance computers.  Almost all Residents will see a low detail stand in instead of your actual avatar.
+    <unique/>
+    <usetemplate
+     ignoretext="Avatar exceeded high detail complexity."
+     name="okignore"
+     yestext="Close"/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ExceededMidDetailRenderCost"
+   persist="false"
+   type="alertmodal">
+    Your avatar has become too complex to be rendered by most computers.  Many Residents will see a low detail stand in instead of your actual avatar.
+  <unique/>
+  <usetemplate
+   ignoretext="Avatar exceeded mid detail complexity."
+   name="okignore"
+   yestext="Close"/>
+</notification>
+
+  <notification
+ icon="notify.tga"
+ name="ExceededLowDetailRenderCost"
+ persist="false"
+ type="alertmodal">
+    Your avatar has become too complex to be rendered by some computers.  Some Residents will see a low detail stand in instead of your actual avatar.
+  <unique/>
+  <usetemplate
+   ignoretext="Avatar exceeded low detail complexity."
+   name="okignore"
+   yestext="Close"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="WearableSave"
@@ -9935,5 +9974,5 @@ An internal error prevented us from properly updating your viewer.  The L$ balan
    <tag>fail</tag>
 Cannot create large prims that intersect other players.  Please re-try when other players have moved.
   </notification>
-
+  
 </notifications>
-- 
cgit v1.2.3


From 86150b4019d1a84b4af73f0ea18c47baff955562 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 21 Feb 2013 19:15:48 -0800
Subject: CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and
 nearby chat

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b50deb7d7a..544f06ac0c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -183,8 +183,7 @@
         </menu_item_call>
          <menu_item_call
          label="Toolbar buttons..."
-         name="Toolbars"
-         shortcut="control|T">
+         name="Toolbars">
             <menu_item_call.on_click
              function="Floater.Toggle"
              parameter="toybox" />
@@ -223,7 +222,8 @@
      tear_off="true">
        <menu_item_check
          label="Conversations..."
-         name="Conversations">
+         name="Conversations"
+         shortcut="control|T">
             <menu_item_check.on_check
              function="Floater.IsOpen"
              parameter="im_container" />
@@ -240,7 +240,7 @@
              function="Floater.Visible"
              parameter="nearby_chat" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
+             function="Floater.ToggleOrBringToFront"
              parameter="nearby_chat" />
         </menu_item_check>
         <menu_item_check
-- 
cgit v1.2.3


From 05f4e8a10517b3b341359a210aeb0af06c44d43a Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 22 Feb 2013 18:53:40 -0800
Subject: CHUI-778 (Saving preferences updates text in all open message panels
 in conversation floater to show as old messages) Now changing the
 log/transcripts file location actually moves the files to the new location.
 Prior behavior just started a new history at that location. Also a fix was
 made so that if the user changed the log/transcripts path then after pressing
 the Preferences 'OK' button the new location will be saved to the
 corresponding .xml file.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3ae9b206a4..234c6d7c0f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10028,4 +10028,15 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   name="PreferenceChatPathChanged"
+   type="alert">
+   Unable to move files. Restored previous path.
+    <usetemplate
+     ignoretext="Unable to move files. Restored previous path."
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+  
 </notifications>
-- 
cgit v1.2.3


From c970cb0283f7fa71aac09f0e7ab71e3a351abd07 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 25 Feb 2013 16:19:35 +0100
Subject: Added "Selected Material Info" menu option to query basic material
 information about the current selection

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 67b7c0258e..abf23935ba 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2559,6 +2559,12 @@
                 <menu_item_call.on_click
                  function="Advanced.SelectedTextureInfo" />
             </menu_item_call>
+            <menu_item_call
+             label="Selected Material Info"
+             name="Selected Material Info">
+                <menu_item_call.on_click
+                 function="Advanced.SelectedMaterialInfo" />
+            </menu_item_call>
             <menu_item_check
              label="Wireframe"
              name="Wireframe"
-- 
cgit v1.2.3


From d1c144519306cae7eff7f781417482c85068988c Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Thu, 28 Feb 2013 17:25:37 -0500
Subject: SH-3909 Support avatar height offset

Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.

Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..883a06d5e1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2991,6 +2991,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
-- 
cgit v1.2.3


From a26c1672235578f3a4e21be370b11522207e2c57 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 4 Mar 2013 20:05:35 +0200
Subject: CHUI-757 FIXED CHUI viewer shows Autopilot cancelled notification
 toast when interrupting click to walk:  - The AutopilotCanceled notification
 was disabled for this viewer;

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3ae9b206a4..9c81c877b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9706,14 +9706,6 @@ There is no suitable surface to sit on, try another spot.
 No room to sit here, try another spot.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="AutopilotCanceled"
-   type="notify">
-   <tag>fail</tag>
-Autopilot canceled
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="ClaimObjectFailedNoPermission"
-- 
cgit v1.2.3


From 477920b13834c977659d11d91d8f2d52e05f54b8 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 5 Mar 2013 15:40:31 +0200
Subject: CHUI-809 FIXED "Start IM" menu item is added

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index 73f0fa7979..88ae441bd3 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -2,6 +2,13 @@
 <context_menu
  layout="topleft"
  name="Url Popup">
+    <menu_item_call
+     label="Send IM"
+     layout="topleft"
+     name="show_agent">
+        <menu_item_call.on_click
+         function="Url.SendIM" />        
+    </menu_item_call>
     <menu_item_call
      label="Show Resident Profile"
      layout="topleft"
-- 
cgit v1.2.3


From 84662ce63bea0d5ff8ff8bed0b12e4162a8514a5 Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Tue, 5 Mar 2013 18:54:43 +0200
Subject: CHUI-764 (Group Profile is not opened after selecting 'Show group
 information' in context menu of 'About Land' dialog)

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
index c5eaf94d22..2cb125ce09 100644
--- a/indra/newview/skins/default/xui/en/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
@@ -7,7 +7,7 @@
      layout="topleft"
      name="show_group">
         <menu_item_call.on_click
-         function="Url.Execute" />
+         function="Url.ShowProfile" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-- 
cgit v1.2.3


From 8b24857f6ae7f4d719697f17e664f095a8aa2753 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sat, 9 Mar 2013 16:11:55 -0600
Subject: Dynamically add and remove "Use texture" normal/specular setting.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..b78f555c9b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -371,6 +371,7 @@ Please try logging in again in a minute.</string>
 
 	<!-- build floater -->
 	<string name="multiple_textures">Multiple</string>
+	<string name="use_texture">Use texture</string>
 
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
-- 
cgit v1.2.3


From 6b067125a0d338c3acc6fd1c786620e474a80aa8 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 11 Mar 2013 14:49:24 -0700
Subject: CHUI-778: Adjusted text in prompts for deleting chat log and chat
 transcripts (per UX).

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 88c02fc84e..c681e39002 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9998,7 +9998,7 @@ Cannot create large prims that intersect other players.  Please re-try when othe
    icon="alertmodal.tga"
    name="PreferenceChatClearLog"
    type="alertmodal">
-    This will delete the log of previous conversations. Proceed?
+    This will delete the logs of previous conversations, and any backups of that file.
     <tag>confirm</tag>
     <usetemplate
      ignoretext="Confirm before I delete the log of previous conversations."
@@ -10011,7 +10011,7 @@ Cannot create large prims that intersect other players.  Please re-try when othe
    icon="alertmodal.tga"
    name="PreferenceChatDeleteTranscripts"
    type="alertmodal">
-    This will delete transcripts for all previous conversations. The list of conversations will not be affected. If you run scripts on your chat transcript files, you may want to proceed with caution. Proceed?
+    This will delete the transcripts for all previous conversations. The list of past conversations will not be affected. All files with the suffixes .txt and txt.backup in the folder [FOLDER] will be deleted.
     <tag>confirm</tag>
     <usetemplate
      ignoretext="Confirm before I delete transcripts."
-- 
cgit v1.2.3


From d81226f1707a93b6be52264fc00cae9c60057cc5 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 12 Mar 2013 15:38:10 +0200
Subject: CHUI-809 FIXED Changes in menu items to make them consistent. Do not
 start IM if selected person is self.

---
 .../newview/skins/default/xui/en/menu_object_icon.xml  | 18 ++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_url_agent.xml  | 17 ++++++++++++-----
 .../newview/skins/default/xui/en/menu_url_objectim.xml |  2 +-
 3 files changed, 31 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index 0c8a2af002..2d4f1792c2 100644
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -24,4 +24,22 @@
          function="ObjectIcon.Action"
          parameter="block" />
     </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action" 
+         parameter="map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport to Object Location"
+     layout="topleft"
+     name="teleport_to_object">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="teleport" />
+    </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index 88ae441bd3..7cd56f257a 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
  layout="topleft"
- name="Url Popup">
+ name="Url Popup">  
     <menu_item_call
-     label="Send IM"
+     label="View Profile"
      layout="topleft"
      name="show_agent">
+        <menu_item_call.on_click
+         function="Url.ShowProfile" />         
+    </menu_item_call>
+    <menu_item_call
+     label="Send IM..."
+     layout="topleft"
+     name="send_im">
         <menu_item_call.on_click
          function="Url.SendIM" />        
     </menu_item_call>
     <menu_item_call
-     label="Show Resident Profile"
+     label="Add Friend..."
      layout="topleft"
-     name="show_agent">
+     name="add_friend">
         <menu_item_call.on_click
-         function="Url.ShowProfile" />
+         function="Url.AddFriend" />        
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
index 35c2269b0d..87ab58e622 100644
--- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  name="Url Popup">
     <menu_item_call
-     label="Show Object Information"
+     label="Object Profile..."
      layout="topleft"
      name="show_object">
         <menu_item_call.on_click
-- 
cgit v1.2.3


From d37b3ca62ea5d1f2d3cd57909d77c42227024c0f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 13 Mar 2013 13:40:26 -0700
Subject: CHUI-839 : Fixed! Make the LLLineEditor in chat preferences read-only
 but selectable

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 9db3816c92..bd096ebb88 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -429,7 +429,6 @@
     </text>
   
     <line_editor
-    	enabled="false"
         control_name="InstantMessageLogPath"
         border_style="line"
         border_thickness="1"
-- 
cgit v1.2.3


From 8b388922434e431c49b9e7f2c9d1e8d90d15ed21 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 14 Mar 2013 01:28:40 +0100
Subject: CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappeared
 Added "Zoom In" context menu item to Nearby Chat list in People floater and
 Conversation floater

---
 .../skins/default/xui/en/menu_conversation.xml     |  9 ++++-
 .../skins/default/xui/en/menu_im_conversation.xml  |  7 ++++
 .../skins/default/xui/en/menu_people_nearby.xml    | 40 ++++++++++++++--------
 .../xui/en/menu_people_nearby_multiselect.xml      | 14 ++++----
 4 files changed, 47 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index fd5c86b3ca..5a13ef0a59 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -89,7 +89,14 @@
         <on_click function="Avatar.DoToSelected" parameter="invite_to_group" />
         <on_enable function="Avatar.EnableItem" parameter="can_invite" />
     </menu_item_call>
-    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>		
+    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>
+    <menu_item_call
+     label="Zoom In"
+     layout="topleft"
+     name="zoom_in">
+      <on_click function="Avatar.DoToSelected" parameter="zoom_in" />
+      <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" />
+    </menu_item_call>
     <menu_item_call
      label="Map"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
index 8882d0a7d8..43287c6ec3 100644
--- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -49,6 +49,13 @@
     </menu_item_call>
     <menu_item_separator
      layout="topleft"/>
+    <menu_item_call
+       label="Zoom In"
+       layout="topleft"
+       name="zoom_in">
+      <on_click function="Avatar.DoToSelected" parameter="zoom_in" />
+      <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" />
+    </menu_item_call>
     <menu_item_call
      label="Map"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 60a6c98514..3abb5f7bc8 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
  layout="topleft"
- name="Avatar Context Menu">
+ name="Nearby People Context Menu">
     <menu_item_call
      label="View Profile"
      layout="topleft"
-     name="View Profile">
+     name="view_profile">
         <menu_item_call.on_click
          function="Avatar.Profile" />
     </menu_item_call>
     <menu_item_call
      label="IM"
      layout="topleft"
-     name="IM">
+     name="im">
         <menu_item_call.on_click
          function="Avatar.IM" />
         <menu_item_call.on_enable
@@ -21,7 +21,7 @@
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
-    name="teleport">
+    name="offer_teleport">
       <menu_item_call.on_click
        function="Avatar.OfferTeleport"/>
       <menu_item_call.on_enable
@@ -31,7 +31,7 @@
     <menu_item_call
      label="Voice call"
      layout="topleft"
-     name="Call">
+     name="voice_call">
         <menu_item_call.on_click
          function="Avatar.Call" />
         <menu_item_call.on_enable
@@ -42,18 +42,18 @@
     <menu_item_call
      label="View chat history..."
      layout="topleft"
-     name="Chat history">
+     name="chat_history">
         <menu_item_call.on_click
          function="Avatar.Calllog" />
         <menu_item_call.on_enable
       	 function="Avatar.EnableItem"
          parameter="can_callog"/>
     </menu_item_call>
-    <menu_item_separator />
+    <menu_item_separator name="separator_chat_history"/>
     <menu_item_call
      label="Add Friend"
      layout="topleft"
-     name="Add Friend">
+     name="add_friend">
         <menu_item_call.on_click
          function="Avatar.AddFriend" />
         <menu_item_call.on_visible
@@ -63,7 +63,7 @@
     <menu_item_call
      label="Remove Friend"
      layout="topleft"
-     name="Remove Friend">
+     name="remove_friend">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
         <menu_item_call.on_enable
@@ -73,18 +73,28 @@
     <menu_item_call
      label="Invite to group..."
      layout="topleft"
-     name="Invite">
+     name="invite_to_group">
         <menu_item_call.on_click
          function="Avatar.InviteToGroup" />
         <menu_item_call.on_enable
       	 function="Avatar.EnableItem"
          parameter="can_invite"/>
     </menu_item_call>
-    <menu_item_separator />
+    <menu_item_separator name="separator_invite_to_group"/>
+    <menu_item_call
+     label="Zoom In"
+     layout="topleft"
+     name="zoom_in">
+      <menu_item_call.on_click
+       function="Avatar.ZoomIn" />
+      <menu_item_call.on_enable
+       function="Avatar.EnableItem"
+       parameter="can_zoom_in"/>
+    </menu_item_call>
     <menu_item_call
      label="Map"
      layout="topleft"
-     name="Map">
+     name="map">
         <menu_item_call.on_click
          function="Avatar.ShowOnMap" />
         <menu_item_call.on_enable
@@ -94,7 +104,7 @@
     <menu_item_call
      label="Share"
      layout="topleft"
-     name="Share">
+     name="share">
         <menu_item_call.on_click
          function="Avatar.Share" />
         <menu_item_call.on_enable
@@ -104,7 +114,7 @@
     <menu_item_call
      label="Pay"
      layout="topleft"
-     name="Pay">
+     name="pay">
         <menu_item_call.on_click
          function="Avatar.Pay" />
         <menu_item_call.on_enable
@@ -114,7 +124,7 @@
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
-     name="Block/Unblock">
+     name="block_unblock">
         <menu_item_check.on_click
          function="Avatar.BlockUnblock" />
         <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 5d58a9d289..5f973088fd 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -6,7 +6,7 @@
      enabled="false"
      label="Add Friends"
      layout="topleft"
-     name="Add Friends">
+     name="add_friends">
         <on_click
          function="Avatar.AddFriends" />
         <on_enable
@@ -16,7 +16,7 @@
     <menu_item_call
      label="Remove Friends"
      layout="topleft"
-     name="Remove Friend">
+     name="remove_friends">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
         <menu_item_call.on_enable
@@ -26,7 +26,7 @@
     <menu_item_call
      label="IM"
      layout="topleft"
-     name="IM">
+     name="im">
         <on_click
          function="Avatar.IM" />
     </menu_item_call>
@@ -34,7 +34,7 @@
      enabled="false"
      label="Call"
      layout="topleft"
-     name="Call">
+     name="call">
         <on_click
          function="Avatar.Call" />
         <on_enable
@@ -45,7 +45,7 @@
      enabled="false"
      label="Share"
      layout="topleft"
-     name="Share">
+     name="share">
         <on_click
          function="Avatar.Share" />
     </menu_item_call>
@@ -53,13 +53,13 @@
      enabled="false"
      label="Pay"
      layout="topleft"
-     name="Pay">
+     name="pay">
         <on_click
          function="Avatar.Pay" />
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
-    name="teleport">
+    name="offer_teleport">
       <menu_item_call.on_click
        function="Avatar.OfferTeleport"/>
       <menu_item_call.on_enable
-- 
cgit v1.2.3


From ee4fbb8e37ca20ebfbf85845dbb67941b7abfd29 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 15 Mar 2013 12:33:46 +0200
Subject: CHUI-830 FIXED Button for collapsing torn-off floater(to a single
 input line) is added. Show toasts for new messages for that conversation,
 regardless of other prefs.

---
 .../skins/default/xui/en/floater_im_session.xml    | 123 ++++++++++++++++++---
 1 file changed, 107 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 8f0574177f..1a9199f9e7 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -19,6 +19,12 @@
  positioning="relative">
     <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
     <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
+    <floater.string
+     name="collapseline_icon"
+     value="Conv_collapse_to_one_line"/>
+    <floater.string
+     name="expandline_icon"
+     value="Conv_expand_one_line"/>
     <floater.string
      name="collapse_icon"
      value="Conv_toolbar_collapse"/>
@@ -65,14 +71,28 @@
         top="0"
         left="0"
         height="355"
-        width="394"> 
-     <panel
+        width="394">
+   <layout_stack
+   animate="true" 
+   default_tab_group="2"
+   follows="all"
+  height="355"
+  width="394"
+  layout="topleft"
+  orientation="vertical"
+   name="main_stack"
+  tab_group="1"
+  top="0"
+  left="0">
+  
+     <layout_panel
          follows="left|top|right"
          layout="topleft"
          name="toolbar_panel"
          top="0"
          left="0"
          height="35"
+         min_height="35"
          width="394">         
              <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
@@ -180,12 +200,19 @@
                  left_pad="5"
                  name="tear_off_btn"
                  width="31" />
-     </panel>
+     </layout_panel>
+     <layout_panel
+      name="body_panel"
+      follows="all"
+      width="394" 
+      height="235" 
+      user_resize="false"
+      auto_resize="true">
   <layout_stack
    animate="true" 
    default_tab_group="2"
   follows="all"
-  height="310"
+  height="275"
   width="394"
   layout="topleft"
   orientation="horizontal"
@@ -198,7 +225,7 @@
       follows="all"
       min_width="115"
       width="150" 
-      height="310" 
+      height="275" 
       user_resize="true"
       auto_resize="true">
       </layout_panel>
@@ -208,7 +235,7 @@
        tab_group="2"
        follows="all"
        top="0"
-       height="310"
+       height="275"
 	   width="244"
        layout="topleft"
        user_resize="true"
@@ -221,13 +248,13 @@
          follows="all"
          layout="topleft"
          visible="true"
-         height="275"
+         height="240"
          width="244">
          <layout_stack
           animate="true" 
           default_tab_group="2"
           follows="all"
-          height="275"
+          height="240"
           width="244"
           layout="topleft"
           visible="true"
@@ -258,7 +285,7 @@
                  width="230" />
             </layout_panel>
             <layout_panel
-             height="248"
+             height="233"
              width="210"
              layout="topleft"
              follows="all"
@@ -273,7 +300,7 @@
                 font="SansSerifSmall"
                 follows="all"
                 visible="true"
-                height="240"
+                height="225"
                 name="chat_history"
                 parse_highlights="true"
                 parse_urls="true"
@@ -283,26 +310,90 @@
             </layout_panel>
            </layout_stack>
            </panel>
-            <chat_editor
+    </layout_panel>
+  </layout_stack>
+  </layout_panel>
+  <layout_panel
+             height="35"
+             layout="topleft"
+             follows="left|right|bottom"
+             left_delta="0"
+             right="0"
+             top_delta="0"
              bottom="0"
+             visible="true"
+             user_resize="false"
+             auto_resize="false"
+             name="chat_layout_panel">
+   <layout_stack
+   animate="true" 
+   default_tab_group="2"
+   follows="all"
+   height="35"
+   right="0"
+   layout="topleft"
+   orientation="horizontal"
+   name="input_panels"
+   top_pad="0"
+   left="0">
+     <layout_panel
+             height="35"
+             layout="topleft"
+             follows="left|right|bottom"
+             left_delta="0"
+             top_delta="0"
+             bottom="0"
+             visible="true"
+             user_resize="false"
+             auto_resize="true"
+             name="input_editor_layout_panel">
+              <chat_editor
+             top="6"
              expand_lines_count="5"
              follows="left|right|bottom"
-	           font="SansSerifSmall"
+               font="SansSerifSmall"
              visible="true"
              height="20"
              is_expandable="true"
              label="To"
              text_tentative_color="TextFgTentativeColor"
-             layout="bottomleft"
+             layout="topleft"
              name="chat_editor"
              max_length="1023"
              spellcheck="true"
              tab_group="3"
-             width="220"
-             left="10"
+             width="160"
+             left="5"
+             right="-5"
              wrap="true">
             </chat_editor>
-    </layout_panel>
+            </layout_panel>
+            <layout_panel             
+             height="35"
+             layout="topleft"
+             follows="left|right|bottom"
+             left_delta="0"
+             top_delta="0"
+             bottom="0"
+             width="35"
+             visible="true"
+             user_resize="false"
+             auto_resize="false"
+             name="input_button_layout_panel">
+            <button
+                 follows="left|right|bottom"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_expand_one_line"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 name="minz_btn"
+                 tool_tip="Shows/hides message panel"
+                 width="28"/>
+           </layout_panel>
+  </layout_stack>
+  </layout_panel>
   </layout_stack>
     </view>
 </floater>
-- 
cgit v1.2.3


From a079acf1aa3b7cfe8ee35bb7afdbae83df0df5ca Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 18 Mar 2013 16:02:09 +0200
Subject: CHUI-861 FIXED "Animate" param is set false.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1a9199f9e7..6862788c65 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -73,7 +73,7 @@
         height="355"
         width="394">
    <layout_stack
-   animate="true" 
+   animate="false" 
    default_tab_group="2"
    follows="all"
   height="355"
-- 
cgit v1.2.3


From 0c5ff7eb4870ac2ec933bd624e6969dbea862dbb Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Tue, 19 Mar 2013 10:57:38 +0200
Subject: CHUI-812 ([CHUIBUG]Resizing "Nearby chat" window creates confusing
 layout)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 6862788c65..c42e58a9f4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -227,7 +227,7 @@
       width="150" 
       height="275" 
       user_resize="true"
-      auto_resize="true">
+      auto_resize="false">
       </layout_panel>
     <layout_panel
        default_tab_group="3"
-- 
cgit v1.2.3


From a8245c51b9cd6fac1d26932dbb1fcf052f00da18 Mon Sep 17 00:00:00 2001
From: Maestro Linden <maestro@lindenlab.com>
Date: Tue, 19 Mar 2013 19:25:24 +0000
Subject: MAINT-2506 added viewer support for
 PERMISSION_SILENT_ESTATE_MANAGEMENT and PERMISSION_OVERRIDE_ANIMATIONS. 
 Reviewed by Simon.

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0f4424a7f9..6be044d03c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -404,8 +404,11 @@ Please try logging in again in a minute.</string>
 	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
 	<string name="ChangePermissions">Change its permissions</string>
 	<string name="TrackYourCamera">Track your camera</string>
-  <string name="ControlYourCamera">Control your camera</string>
-  <string name="TeleportYourAgent">Teleport you</string>
+	<string name="ControlYourCamera">Control your camera</string>
+	<string name="TeleportYourAgent">Teleport you</string>
+	<string name="ManageEstateSilently">Manage your estates silently</string>
+	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
+	
   <string name="NotConnected">Not Connected</string>
 
 	<!-- Sim Access labels -->
-- 
cgit v1.2.3


From 2a8baeed3a2dc67abff131249aa23538e76fb05d Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 19 Mar 2013 16:46:04 -0700
Subject: CHUI-843 ([CHUIBUG]Suggested alteration to toolbar_panel in
 floater_im_container in CHUI): Adjusted button layout in conversation
 floater.

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 10 +++++-----
 indra/newview/skins/default/xui/en/floater_im_session.xml   | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 12c1676127..65f623a47e 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -61,7 +61,7 @@
                      image_unselected="Toolbar_Middle_Off"
                      menu_filename="menu_participant_view.xml"
                      layout="topleft"
-                     left="10"
+                     left="5"
                      name="sort_btn"
                      tool_tip="View/sort options"
                      top="5"
@@ -75,7 +75,7 @@
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
                      top="5"
-                     left_pad="4"
+                     left_pad="2"
                      name="add_btn"
                      tool_tip="Start a new conversation"
                      width="31"/>
@@ -88,7 +88,7 @@
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
                      top="5"
-                     left_pad="4"
+                     left_pad="2"
                      name="speak_btn"
                      tool_tip="Speak with people using your microphone"
                      width="31"/>	
@@ -114,7 +114,7 @@
                 </layout_panel>
             </layout_stack>
             <panel
-             bottom="-5"
+             bottom="-1"
              follows="all"
              layout="topleft"
              name="conversations_list_panel"
@@ -129,7 +129,7 @@
          name="messages_layout_panel"
          expanded_min_dim="222">
             <panel_container
-             bottom="-5"
+             bottom="-1"
              follows="all"
              layout="topleft"
              left="0"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 6862788c65..56a1b35caf 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -118,7 +118,7 @@
 				 image_unselected="Toolbar_Middle_Off"
 				 layout="topleft"
 			 	 top="5"
-			 	 left_pad="4"
+			 	 left_pad="2"
 				 name="gear_btn"
 				 visible="false"
 				 tool_tip="Actions on selected person"
@@ -133,7 +133,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left_pad="4"
+                 left_pad="2"
                  name="add_btn"
                  tool_tip="Add someone to this conversation"
                  width="31"/>
@@ -146,7 +146,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left_pad="4"
+                 left_pad="2"
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
                  width="31"/>
@@ -171,7 +171,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left="283"
+                 left="292"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
@@ -184,7 +184,7 @@
              	 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left_pad="5"
+                 left_pad="2"
                  name="expand_collapse_btn"
                  tool_tip="Collapse/Expand this pane"
                  width="31" />
@@ -197,7 +197,7 @@
              	 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left_pad="5"
+                 left_pad="2"
                  name="tear_off_btn"
                  width="31" />
      </layout_panel>
-- 
cgit v1.2.3


From 50810975472a1674e955a063f537011a000dc775 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 20 Mar 2013 16:17:05 -0400
Subject: storm-1910 fix merge of people panel with chui

---
 .../newview/skins/default/xui/en/panel_people.xml  | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 39a46829b9..ed274d0233 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -396,16 +396,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
      Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
     -->
-    <text
-     type="string"
-     length="1"
-     follows="left|bottom"
-     height="14"
-     layout="topleft"
-     right="-10"
-     name="groupcount">
-You belong to [COUNT] groups, and can join [REMAINING] more.
-    </text>
             <panel
              follows="left|top|right"
              height="27"
@@ -490,10 +480,22 @@ You belong to [COUNT] groups, and can join [REMAINING] more.
                      function="People.Group.Minus" />
                 </dnd_button>
             </panel>
+            <text
+                type="string"
+                length="1"
+                follows="all"
+                height="14"
+                layout="topleft"
+                right="-10"
+                top_pad="4"
+                left="3"
+                name="groupcount">
+              You belong to [COUNT] groups, and can join [REMAINING] more.
+            </text>
             <group_list
              allow_select="true" 
              follows="all"
-             height="406"
+             height="388"
              layout="topleft"
              left="3"
              name="group_list"
-- 
cgit v1.2.3


From 8e54ae95d1417f51edd6c68c389fd6cd7322ca52 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Wed, 20 Mar 2013 15:25:14 -0700
Subject: Prototype code for "simple imposter" mode rendering of avatars.
 Reviewed by Kelly

---
 .../skins/default/xui/en/menu_attachment_other.xml | 35 +++++++++++++++++++
 .../skins/default/xui/en/menu_avatar_other.xml     | 39 +++++++++++++++++++++-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 +++++
 3 files changed, 82 insertions(+), 1 deletion(-)

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

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 00d4b1dab1..87fa7c3f00 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -104,8 +104,43 @@
          <menu_item_call.on_enable
           function="Object.EnableInspect" />
    </menu_item_call>
+
+   <menu_item_separator />
+    
+      <menu_item_check
+        name="Normal"
+        label="Normal">
+        <menu_item_check.on_check
+          function="Avatar.CheckImposterMode"
+          parameter="0" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImposterMode"
+	      parameter="0" />
+      </menu_item_check>
+      <menu_item_check
+        name="Always use imposter"
+        label="Always use imposter">
+        <menu_item_check.on_check
+          function="Avatar.CheckImposterMode"
+          parameter="1" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImposterMode"
+	      parameter="1" />
+      </menu_item_check>
+      <menu_item_check
+        name="Never use imposter"
+        label="Never use imposter">
+        <menu_item_check.on_check
+          function="Avatar.CheckImposterMode"
+          parameter="2" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImposterMode"
+	      parameter="2" />
+      </menu_item_check>
+
   <menu_item_separator
        layout="topleft" />
+
   <menu_item_call
      enabled="false"
      label="Mute Particle Owner"
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 73fa086f28..60b7e3e77c 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -39,8 +39,10 @@
       <menu_item_call.on_click
          function="Avatar.InviteToGroup" />
       </menu_item_call>
+    
    <menu_item_separator />
-    <menu_item_call
+   
+     <menu_item_call
      enabled="false"
      label="Block"
      name="Avatar Mute">
@@ -95,8 +97,43 @@
         <menu_item_call.on_enable
          function="EnablePayAvatar" />
     </menu_item_call>
+
+   <menu_item_separator />
+    
+      <menu_item_check
+        name="Normal"
+        label="Normal">
+        <menu_item_check.on_check
+          function="Avatar.CheckImposterMode"
+          parameter="0" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImposterMode"
+	      parameter="0" />
+      </menu_item_check>
+      <menu_item_check
+        name="Always use imposter"
+        label="Always use imposter">
+        <menu_item_check.on_check
+          function="Avatar.CheckImposterMode"
+          parameter="1" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImposterMode"
+	      parameter="1" />
+      </menu_item_check>
+      <menu_item_check
+        name="Never use imposter"
+        label="Never use imposter">
+        <menu_item_check.on_check
+          function="Avatar.CheckImposterMode"
+          parameter="2" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImposterMode"
+	      parameter="2" />
+      </menu_item_check>
+
   <menu_item_separator
        layout="topleft" />
+
   <menu_item_call
      enabled="false"
      label="Mute Particle Owner"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 544f06ac0c..4646d307aa 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -543,6 +543,15 @@
             <menu_item_check.on_check
                control="NavBarShowParcelProperties" />
           </menu_item_check>
+          <menu_item_check
+             label="Simple Imposters"
+             name="RenderAutoMuteEnabled">
+            <menu_item_check.on_check
+               control="RenderAutoMuteEnabled" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="RenderAutoMuteEnabled" />
+          </menu_item_check>
           <menu_item_separator />
           <menu_item_check
              label="Advanced Menu"
-- 
cgit v1.2.3


From 1df1ce7a31df77743675899d4a15458ac84a281a Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 21 Mar 2013 15:57:44 +0200
Subject: CHUI-858 FIXED Text can be clipped by text input bar in message panel

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index e081ea8e74..1ad54bdb6b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -266,6 +266,7 @@
           left="0">
             <layout_panel
              auto_resize="false"
+             user_resize="false"
              height="26"
              layout="topleft"
              left_delta="0"
@@ -285,7 +286,6 @@
                  width="230" />
             </layout_panel>
             <layout_panel
-             height="233"
              width="210"
              layout="topleft"
              follows="all"
@@ -293,19 +293,21 @@
              top_delta="0"
              bottom="0"
              visible="true"
-             user_resize="true"
+             user_resize="false"
              auto_resize="true"
              name="chat_holder">      
                <chat_history
                 font="SansSerifSmall"
                 follows="all"
                 visible="true"
-                height="225"
                 name="chat_history"
                 parse_highlights="true"
                 parse_urls="true"
+                layout="topleft"
                 right="-5"
-                left="5">
+                left="5"
+                top="0"
+                bottom="1">
                </chat_history>
             </layout_panel>
            </layout_stack>
@@ -348,7 +350,6 @@
              auto_resize="true"
              name="input_editor_layout_panel">
               <chat_editor
-             top="6"
              expand_lines_count="5"
              follows="left|right|bottom"
                font="SansSerifSmall"
@@ -363,6 +364,7 @@
              spellcheck="true"
              tab_group="3"
              width="160"
+             top="6"
              left="5"
              right="-5"
              wrap="true">
-- 
cgit v1.2.3


From bbfd1c0f2d89de50c0c0e026208036e2bc963104 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 21 Mar 2013 18:44:01 +0200
Subject: CHUI-878 FIXED Torn off conversation window width can be reduced and
 lose vertical scroll bar: manually setting of the floater's minimal size

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1ad54bdb6b..d8b085063f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,7 +14,6 @@
  width="394"
  can_resize="true"
  can_tear_off="false"
- min_width="340"
  min_height="190"
  positioning="relative">
     <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
@@ -223,9 +222,10 @@
     <layout_panel
       name="speakers_list_panel"
       follows="all"
-      min_width="115"
+      expanded_min_dim="115"
+      min_dim="0"
       width="150" 
-      height="275" 
+      height="275"
       user_resize="true"
       auto_resize="false">
       </layout_panel>
@@ -241,7 +241,7 @@
        user_resize="true"
        auto_resize="true"
        visible="true"
-       name="left_part_holder"
+       name="right_part_holder"
        min_width="221">
         <panel
          name="trnsAndChat_panel"
-- 
cgit v1.2.3


From ace5a9bf6c087a70d5183371d1aa988a1ee17a2a Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 25 Mar 2013 14:41:42 -0700
Subject: sync with viewer-development

---
 .../skins/default/xui/da/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/da/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/de/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/de/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/de/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/en/floater_camera.xml        |   4 +-
 .../skins/default/xui/en/floater_chat_bar.xml      |  85 --
 .../default/xui/en/floater_conversation_log.xml    |  84 ++
 .../xui/en/floater_conversation_preview.xml        |  64 ++
 .../skins/default/xui/en/floater_destinations.xml  |   6 +-
 .../skins/default/xui/en/floater_im_container.xml  | 203 ++++-
 .../skins/default/xui/en/floater_im_session.xml    | 418 +++++++--
 .../skins/default/xui/en/floater_incoming_call.xml |  58 +-
 .../skins/default/xui/en/floater_moveview.xml      |   4 +-
 .../default/xui/en/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/en/floater_people.xml        |  14 +-
 .../default/xui/en/floater_voice_chat_volume.xml   |  48 ++
 .../default/xui/en/floater_voice_controls.xml      | 155 ----
 .../skins/default/xui/en/floater_voice_effect.xml  |   3 +-
 .../skins/default/xui/en/floater_voice_volume.xml  |  59 ++
 .../skins/default/xui/en/inspect_avatar.xml        | 100 +--
 .../newview/skins/default/xui/en/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/en/menu_conversation.xml     | 203 +++++
 .../default/xui/en/menu_conversation_log_gear.xml  | 142 ++++
 .../default/xui/en/menu_conversation_log_view.xml  |  45 +
 .../skins/default/xui/en/menu_group_plus.xml       |   4 +-
 .../skins/default/xui/en/menu_im_conversation.xml  | 101 +++
 .../default/xui/en/menu_im_session_showmodes.xml   |  49 ++
 .../skins/default/xui/en/menu_im_well_button.xml   |  16 -
 .../default/xui/en/menu_inspect_avatar_gear.xml    | 143 ----
 .../default/xui/en/menu_inspect_self_gear.xml      | 252 ------
 .../skins/default/xui/en/menu_object_icon.xml      |  18 +
 .../skins/default/xui/en/menu_participant_view.xml | 112 +++
 .../default/xui/en/menu_people_blocked_gear.xml    |  26 +
 .../default/xui/en/menu_people_blocked_plus.xml    |  20 +
 .../default/xui/en/menu_people_blocked_view.xml    |  26 +
 .../default/xui/en/menu_people_friends_view.xml    |  51 ++
 .../xui/en/menu_people_friends_view_sort.xml       |  47 --
 .../skins/default/xui/en/menu_people_groups.xml    |  27 +-
 .../default/xui/en/menu_people_groups_view.xml     |  17 +
 .../xui/en/menu_people_groups_view_sort.xml        |  26 -
 .../skins/default/xui/en/menu_people_nearby.xml    |  99 ++-
 .../xui/en/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/en/menu_people_nearby_view.xml     |  53 ++
 .../xui/en/menu_people_nearby_view_sort.xml        |  57 --
 .../default/xui/en/menu_people_recent_view.xml     |  35 +
 .../xui/en/menu_people_recent_view_sort.xml        |  39 -
 .../skins/default/xui/en/menu_url_agent.xml        |  20 +-
 .../skins/default/xui/en/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 165 +++-
 .../newview/skins/default/xui/en/notifications.xml | 165 +++-
 .../skins/default/xui/en/panel_activeim_row.xml    |  97 ---
 .../default/xui/en/panel_adhoc_control_panel.xml   |  95 ---
 .../default/xui/en/panel_avatar_list_item.xml      |   1 +
 .../default/xui/en/panel_block_list_sidetray.xml   | 163 ++--
 .../default/xui/en/panel_blocked_list_item.xml     |  71 ++
 .../skins/default/xui/en/panel_bottomtray_lite.xml |   2 +-
 .../skins/default/xui/en/panel_chiclet_bar.xml     |  48 --
 .../xui/en/panel_conversation_list_item.xml        |  98 +++
 .../xui/en/panel_conversation_log_list_item.xml    | 107 +++
 .../default/xui/en/panel_group_control_panel.xml   | 109 ---
 .../skins/default/xui/en/panel_group_list_item.xml |   1 +
 .../default/xui/en/panel_im_control_panel.xml      | 166 ----
 .../skins/default/xui/en/panel_inbox_inventory.xml |   2 +-
 .../skins/default/xui/en/panel_landmarks.xml       |  16 +-
 .../skins/default/xui/en/panel_nearby_chat.xml     |  22 +-
 .../skins/default/xui/en/panel_nearby_chat_bar.xml |   2 +-
 .../default/xui/en/panel_outbox_inventory.xml      |  25 +-
 .../newview/skins/default/xui/en/panel_people.xml  | 929 +++++++++------------
 .../default/xui/en/panel_preferences_chat.xml      | 693 ++++++++++-----
 .../default/xui/en/panel_preferences_colors.xml    |   4 +-
 .../default/xui/en/panel_preferences_general.xml   |   6 +-
 .../default/xui/en/panel_preferences_graphics1.xml |  15 +-
 .../default/xui/en/panel_preferences_privacy.xml   | 226 ++---
 indra/newview/skins/default/xui/en/strings.xml     |  42 +-
 .../skins/default/xui/en/widgets/chat_editor.xml   |   4 +
 .../default/xui/en/widgets/chiclet_im_adhoc.xml    |  55 --
 .../default/xui/en/widgets/chiclet_im_group.xml    |  56 --
 .../default/xui/en/widgets/chiclet_im_p2p.xml      |  56 --
 .../en/widgets/conversation_view_participant.xml   |  42 +
 .../xui/en/widgets/conversation_view_session.xml   |  16 +
 .../default/xui/en/widgets/folder_view_item.xml    |   8 +-
 .../xui/en/widgets/inbox_folder_view_folder.xml    |   8 +-
 .../xui/en/widgets/inbox_inventory_panel.xml       |   3 +-
 .../xui/en/widgets/outbox_folder_view_folder.xml   |   9 -
 .../xui/en/widgets/outbox_inventory_panel.xml      |   2 -
 .../newview/skins/default/xui/en/widgets/text.xml  |   1 +
 .../skins/default/xui/en/widgets/toolbar.xml       |  12 +-
 .../skins/default/xui/es/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/es/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/es/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/fr/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/fr/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/fr/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/it/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/it/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/it/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/ja/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/ja/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/ja/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/pl/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/pl/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/pt/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/pt/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/pt/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/ru/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/ru/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/ru/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/tr/floater_chat_bar.xml      |   2 +-
 .../skins/default/xui/tr/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/tr/panel_nearby_chat_bar.xml |   2 +-
 .../skins/default/xui/zh/menu_im_well_button.xml   |   4 -
 .../skins/default/xui/zh/panel_nearby_chat_bar.xml |   2 +-
 113 files changed, 3608 insertions(+), 2969 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_chat_bar.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_voice_controls.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_activeim_row.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_im_control_panel.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/chat_editor.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_im_well_button.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_im_well_button.xml

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

diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
deleted file mode 100644
index 4889230919..0000000000
--- a/indra/newview/skins/default/xui/da/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Luk alle" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
index 949cbcbd7b..eb104201f8 100644
--- a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Klik her for at chatte." name="chat_box" tool_tip="Tryk på enter for at tale, Ctrl-Enter for at råbe."/>
 	<button name="show_nearby_chat" tool_tip="Viser/skjuler log for chat nærved"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
index 2464a55665..ab77d4dae5 100644
--- a/indra/newview/skins/default/xui/de/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT IN DER NÄHE">
+<floater name="nearby_chat" title="CHAT IN DER NÄHE">
 	<panel name="bottom_panel">
 		<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabetaste zum Sprechen, Strg+Eingabe zum Rufen"/>
 		<button name="show_nearby_chat" tool_tip="Chatprotokoll in der Nähe ein-/ausblenden"/>
diff --git a/indra/newview/skins/default/xui/de/menu_im_well_button.xml b/indra/newview/skins/default/xui/de/menu_im_well_button.xml
deleted file mode 100644
index f464b71f4a..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Alle schließen" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
index 08cc0b0ec8..69cf6d98de 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabe drücken, um zu sprechen, Strg-Eingabe drücken, um zu Rufen."/>
 	<button name="show_nearby_chat" tool_tip="Protokoll des Chats in der Nähe anzeigen/ausblenden"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 22bc488a92..521389d7b3 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="458"
- bottom="-80"
+ right="-460"
+ bottom="-50"
  follows="left|bottom"
  legacy_header_height="18"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
deleted file mode 100644
index 405557242f..0000000000
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="specified"
- left="10"
- bottom="-10"
- height="60"
- layout="topleft"
- legacy_header_height="25"
- single_instance="true"
- title="NEARBY CHAT"
- save_rect="true"
- save_visibility="true"
- can_close="true"
- can_minimize="true"
- help_topic="chat_bar"
- min_height="60"
- min_width="150"
- can_resize="true"
- default_tab_group="1"
- name="chat_bar"
- width="300">
-    <panel
-        top="20"
-        class="panel_nearby_chat"
-        follow="all"
-        width="300"
-        height="0"
-        visible="false"
-        filename="panel_nearby_chat.xml"
-        name="nearby_chat" />
-    <panel width="300" 
-           height="31" 
-           left="0" 
-           name="bottom_panel"
-           bottom="-1" 
-           follows="left|right|bottom" 
-           tab_group="1">
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|right"
-        height="23"
-        label="Click here to chat."
-        layout="topleft"
-        left_delta="7"
-        left="0"
-        max_length_bytes="1023"
-        name="chat_box"
-        spellcheck="true"
-        text_pad_left="5"
-        text_pad_right="25"
-        tool_tip="Press Enter to say, Ctrl+Enter to shout"
-        top="2"
-        width="255" />
-      <output_monitor
-        auto_update="true"
-        follows="right"
-        draw_border="false"
-        height="16"
-        layout="topleft"
-        left_pad="-24"
-        mouse_opaque="true"
-        name="chat_zone_indicator"
-        top="6"
-        visible="true"
-        width="20" />
-      <button
-        follows="right"
-        is_toggle="true"
-        width="20"
-        top="2"
-        layout="topleft"
-        left_pad="12"
-        image_disabled="ComboButton_UpOff"
-        image_unselected="ComboButton_UpOff"
-        image_selected="ComboButton_On"
-        image_pressed="ComboButton_UpSelected"
-        image_pressed_selected="ComboButton_Selected"
-        height="23"
-        chrome="true"
-        name="show_nearby_chat"
-        tool_tip="Shows/hides nearby chat log">
-      </button>
-    </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
new file mode 100644
index 0000000000..19a4cbc119
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+ can_resize="true"
+ positioning="cascading"
+ help_topic="conversation_log"
+ height="200"
+ min_height="100"
+ min_width="230"
+ layout="topleft"
+ name="floater_conversation_log"
+ save_rect="true"
+ single_instance="true"
+ reuse_instance="true"
+ title="CONVERSATION LOG"
+ width="300">
+  <panel
+   follows="left|top|right"
+   height="32"
+   left="0"
+   name="buttons_panel"
+   top="0">
+    <filter_editor
+     follows="left|top|right"
+     height="23"
+     layout="topleft"
+     left="8"
+     label="Filter People"
+     max_length_chars="300"
+     name="people_filter_input"
+     text_color="Black"
+     text_pad_left="10"
+     top="4"
+     width="204" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="Conv_toolbar_sort"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="8"
+     menu_filename="menu_conversation_log_view.xml"
+     menu_position="bottomleft"
+     name="conversation_view_btn"
+     tool_tip="View/sort options"
+     top="3"
+     width="31" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="OptionsMenu_Off"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="8"
+     name="conversations_gear_btn"
+     tool_tip="Actions on selected person or group"
+     top="3"
+     width="31" />
+  </panel>
+  <panel
+   bottom="-1"
+   follows="all"
+   left="0"
+   name="log_panel"
+   right="-1"
+   top="32">
+    <conversation_log_list
+     allow_select="true"
+     bottom="-8"
+     opaque="true"
+     follows="all"
+     left="8"
+     keep_selection_visible_on_reshape="true"
+     item_pad="2"
+     multi_select="false"
+     name="conversation_log_list"
+     right="-8"
+     top="0" />
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
new file mode 100644
index 0000000000..764b9d8385
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ help_topic="conversation_preview"
+ height="391"
+ layout="topleft"
+ min_height="243"
+ min_width="234"
+ name="preview_conversation"
+ title="CONVERSATION:"
+ width="400">
+    <floater.string
+     name="Title">
+        CONVERSATION: [NAME]
+    </floater.string>
+    <chat_history
+     font="SansSerifSmall"
+     follows="all"
+     visible="true"
+     height="330"
+     name="chat_history"
+     notify_unread_msg="false"
+     parse_highlights="true"
+     parse_urls="true"
+     left="5"
+     top_pad="25"
+     width="390">
+    </chat_history>
+    <text
+     follows="bottom|right"
+     font="SansSerif"
+     height="22"
+     layout="topleft"
+     name="page_label"
+     right="-110"
+     top_pad="7"
+     value="Page"
+     width="35">
+    </text>
+    <spinner
+     allow_digits_only="true"
+     decimal_digits="0"
+     follows="bottom|right"
+     height="23"
+     increment="1"
+     label_width="40"
+     layout="topleft"
+     left_pad="0"
+     name="history_page_spin"
+     top_delta="-3"
+     width="50"/>
+    <text
+     follows="bottom|right"
+     font="SansSerif"
+     height="22"
+     layout="topleft"
+     name="page_num_label"
+     left_pad="5"
+     top_delta="4"
+     width="40">
+    </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 39aa8e07bb..94ebaa9cb2 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- positioning="cascading"
+ positioning="cascading"	
  ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
@@ -17,11 +17,11 @@
  save_rect="true"
  save_visibility="true"
  title="DESTINATIONS"
- width="840">
+ width="550">
     <web_browser
       top="25"
       height="200"
-      width="840"
+      width="550"
       follows="all"
       name="destination_guide_contents"
       trusted_content="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e123de46c2..65f623a47e 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,49 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater
- can_close="false"  
+ can_close="true"  
  can_minimize="true"
  can_resize="true"
- height="390"
+ height="210"
  layout="topleft"
  name="floater_im_box"
  help_topic="floater_im_box"
  save_rect="true"
  save_visibility="true"
  single_instance="true"
+ reuse_instance="true"
  title="CONVERSATIONS"
- width="396">
-    <tab_container
-     follows="left|right|top|bottom"
-     height="390"
+ bottom="-50"
+ right="-5"
+ width="450"
+ min_width="38">
+    <string
+     name="collapse_icon"
+     value="Conv_toolbar_collapse"/>
+    <string
+     name="expand_icon"
+     value="Conv_toolbar_expand"/>
+    <layout_stack
+     animate="true" 
+     bottom="-1"
+     follows="all"
      layout="topleft"
-     left="1"
-     name="im_box_tab_container"
-     tab_position="bottom"
-     tab_width="64"
-     tab_max_width = "134"
-     tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     halign="left"
-     use_ellipses="true"
-     top="0"
-     width="394">
-      <first_tab
-       tab_bottom_image_flash="Toolbar_Left_Flash"/>
-      <middle_tab
-       tab_bottom_image_flash="Toolbar_Middle_Flash"/>
-      <last_tab
-       tab_bottom_image_flash="Toolbar_Right_Flash"/>
-    </tab_container>
-    <icon
-     color="DefaultShadowLight"
-     enabled="false"
-     follows="left|right|bottom"
-     height="17"
-     image_name="tabarea.tga"
-     layout="bottomleft"
-     left="1"
-     name="im_box_tab_container_icon"
-     bottom="10"
-     width="394" />
+     left="0"
+     name="conversations_stack"
+     orientation="horizontal"
+     right="-1"
+     top="0">
+        <layout_panel
+         auto_resize="false"
+         user_resize="true"        
+         name="conversations_layout_panel"
+         min_dim="38"
+         expanded_min_dim="156">
+            <layout_stack
+             animate="false" 
+             follows="left|top|right"
+             height="35"
+             layout="topleft"
+             left="0"
+             name="conversations_pane_buttons_stack"
+             orientation="horizontal"
+             right="-1"
+             top="0">
+                <layout_panel
+                 auto_resize="true"
+                 height="35"
+                 name="conversations_pane_buttons_expanded">
+                    <menu_button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_sort"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     menu_filename="menu_participant_view.xml"
+                     layout="topleft"
+                     left="5"
+                     name="sort_btn"
+                     tool_tip="View/sort options"
+                     top="5"
+                     width="31" />
+                    <button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_plus"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="5"
+                     left_pad="2"
+                     name="add_btn"
+                     tool_tip="Start a new conversation"
+                     width="31"/>
+                    <button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Command_Speak_Icon"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="5"
+                     left_pad="2"
+                     name="speak_btn"
+                     tool_tip="Speak with people using your microphone"
+                     width="31"/>	
+                </layout_panel>
+                <layout_panel
+                 auto_resize="false"
+                 height="35"
+                 name="conversations_pane_buttons_collapsed"
+                 width="41">
+                    <button
+                     follows="right|top"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_collapse"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="5"
+                     left="1"
+                     name="expand_collapse_btn"
+                     tool_tip="Collapse/Expand this list"
+                     width="31" />
+                </layout_panel>
+            </layout_stack>
+            <panel
+             bottom="-1"
+             follows="all"
+             layout="topleft"
+             name="conversations_list_panel"
+             opaque="true"
+             top="35"
+             left="5"
+             right="-1"/>
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         user_resize="true"
+         name="messages_layout_panel"
+         expanded_min_dim="222">
+            <panel_container
+             bottom="-1"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="im_box_tab_container"
+             right="-1"
+             top="0">
+             <panel
+               bottom="-1"
+               follows="all"
+               layout="topleft"
+               name="stub_panel"
+               opaque="true"
+               top_pad="0"
+               left="0"
+               right="-1">
+                 <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_collapse"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 right="-10"
+                 name="stub_collapse_btn"
+                 tool_tip="Collapse this pane"
+                 width="31" />
+                 <text
+                   type="string"
+                   clip_partial="false"
+                   follows="left|top|right"
+                   layout="topleft"
+                   left="15"
+                   right="-15"
+                   name="stub_textbox"
+                   top="25"
+                   height="40"
+                   valign="center"
+                   parse_urls="true"
+                   wrap="true">
+                   This conversation is in a separate window.   [secondlife:/// Bring it back.]
+                 </text>
+             </panel>
+            </panel_container>
+        </layout_panel>
+    </layout_stack>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 040b66623e..d8b085063f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  background_visible="true"
  default_tab_group="1"
  height="355"
@@ -10,84 +9,393 @@
  can_dock="false"
  can_minimize="true"
  can_close="true"
+ save_rect="true"
  visible="false"
  width="394"
  can_resize="true"
- min_width="250"
- min_height="190">
+ can_tear_off="false"
+ min_height="190"
+ positioning="relative">
+    <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
+    <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
+    <floater.string
+     name="collapseline_icon"
+     value="Conv_collapse_to_one_line"/>
+    <floater.string
+     name="expandline_icon"
+     value="Conv_expand_one_line"/>
+    <floater.string
+     name="collapse_icon"
+     value="Conv_toolbar_collapse"/>
+    <floater.string
+     name="expand_icon"
+     value="Conv_toolbar_expand"/>
+    <floater.string
+     name="tear_off_icon"
+     value="Conv_toolbar_arrow_ne"/>
+    <floater.string
+     name="return_icon"
+     value="Conv_toolbar_arrow_sw"/>
+    <floater.string
+     name="participant_added"
+     value="[NAME] was invited to the conversation."/>
+    <floater.string
+     name="multiple_participants_added"
+     value="[NAME] were invited to the conversation."/>
+     <floater.string
+     name="tooltip_to_separate_window"
+     value="Move this conversation to a separate window"/>
+     <floater.string
+     name="tooltip_to_main_window"
+     value="Move this conversation back to main window"/>
+  <floater.string
+     name="start_call_button_tooltip"
+     value="Open voice connection"/>
+  <floater.string
+     name="end_call_button_tooltip"
+     value="Close voice connection"/>
+   <floater.string
+     name="expcol_button_not_tearoff_tooltip"
+     value="Collapse this pane"/>
+   <floater.string
+     name="expcol_button_tearoff_and_expanded_tooltip"
+     value="Collapse participant list"/>
+   <floater.string
+     name="expcol_button_tearoff_and_collapsed_tooltip"
+     value="Expand participant list"/>
+    <view
+        follows="all"
+        layout="topleft"
+        name="contents_view"
+        top="0"
+        left="0"
+        height="355"
+        width="394">
+   <layout_stack
+   animate="false" 
+   default_tab_group="2"
+   follows="all"
+  height="355"
+  width="394"
+  layout="topleft"
+  orientation="vertical"
+   name="main_stack"
+  tab_group="1"
+  top="0"
+  left="0">
+  
+     <layout_panel
+         follows="left|top|right"
+         layout="topleft"
+         name="toolbar_panel"
+         top="0"
+         left="0"
+         height="35"
+         min_height="35"
+         width="394">         
+             <menu_button
+                 menu_filename="menu_im_session_showmodes.xml"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left="5"
+                 name="view_options_btn"
+                 tool_tip="View/sort options"
+                 top="5"
+                 width="31" />
+             <menu_button
+				 menu_filename="menu_im_conversation.xml"
+				 follows="top|left"
+				 height="25"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_overlay="OptionsMenu_Off"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 layout="topleft"
+			 	 top="5"
+			 	 left_pad="2"
+				 name="gear_btn"
+				 visible="false"
+				 tool_tip="Actions on selected person"
+				 width="31"/>
+             <button
+                 enabled="false"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_add_person"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="2"
+                 name="add_btn"
+                 tool_tip="Add someone to this conversation"
+                 width="31"/>
+             <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_open_call"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="2"
+                 name="voice_call_btn"
+                 tool_tip="Open voice connection"
+                 width="31"/>
+              <output_monitor
+                  auto_update="true"
+                  follows="top|left"
+                  draw_border="false"
+                  height="16"
+                  layout="topleft"
+                  top="10"
+                  left_pad="10"
+                  mouse_opaque="true"
+                  name="speaking_indicator"
+                  visible="false"
+                  width="20" />       
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_close"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left="292"
+                 name="close_btn"
+                 tool_tip="End this conversation"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_collapse"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="2"
+                 name="expand_collapse_btn"
+                 tool_tip="Collapse/Expand this pane"
+                 width="31" />
+             <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_arrow_ne"
+                 image_selected="Toolbar_Middle_Selected"
+             	 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="2"
+                 name="tear_off_btn"
+                 width="31" />
+     </layout_panel>
+     <layout_panel
+      name="body_panel"
+      follows="all"
+      width="394" 
+      height="235" 
+      user_resize="false"
+      auto_resize="true">
   <layout_stack
    animate="true" 
    default_tab_group="2"
   follows="all"
-  height="320"
+  height="275"
   width="394"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
   tab_group="1"
-  top="20"
+  top_pad="0"
   left="0">
     <layout_panel
-      name="im_control_panel_holder"
-      min_width="115"
+      name="speakers_list_panel"
+      follows="all"
+      expanded_min_dim="115"
+      min_dim="0"
       width="150" 
-      height="320" 
+      height="275"
+      user_resize="true"
       auto_resize="false">
-      <panel
-        name="panel_im_control_panel"
-        layout="topleft"
-        height="320"
-        width="150" 
-        follows="all"/>
       </layout_panel>
     <layout_panel
        default_tab_group="3"
        left="0"
        tab_group="2"
+       follows="all"
        top="0"
-       height="200"
-	     width="244"
-       user_resize="true">
-        <button
-          height="20"
-          follows="left|top"
-          top="0"
-          left="2"
-          image_overlay="TabIcon_Open_Off"
+       height="275"
+	   width="244"
+       layout="topleft"
+       user_resize="true"
+       auto_resize="true"
+       visible="true"
+       name="right_part_holder"
+       min_width="221">
+        <panel
+         name="trnsAndChat_panel"
+         follows="all"
+         layout="topleft"
+         visible="true"
+         height="240"
+         width="244">
+         <layout_stack
+          animate="true" 
+          default_tab_group="2"
+          follows="all"
+          height="240"
+          width="244"
           layout="topleft"
-          width="25"
-          name="slide_left_btn" />
-         <button
-          height="20"
-          follows="left|top"
+          visible="true"
+          orientation="vertical"
+          name="translate_and_chat_stack"
+          tab_group="1"
+          left_pad="0"
           top="0"
-          left="2"
-          image_overlay="TabIcon_Close_Off"
-          width="25"
-          name="slide_right_btn" />
-        <chat_history
-	 font="SansSerifSmall"
-         follows="left|right|top|bottom"
-         height="150"
-         name="chat_history"
-         parse_highlights="true"
-         parse_urls="true"
-        left="1"
-         width="238">
-        </chat_history>
-        <line_editor
-         bottom="0"
-         left="3"
-         follows="left|right|bottom"
-	 font="SansSerifSmall"
-         height="20"
-         label="To"
-         layout="bottomleft"
-         name="chat_editor"
-         spellcheck="true"
-         tab_group="3"
-         width="236">
-        </line_editor>
+          left="0">
+            <layout_panel
+             auto_resize="false"
+             user_resize="false"
+             height="26"
+             layout="topleft"
+             left_delta="0"
+             name="translate_chat_checkbox_lp"
+             top_delta="0"
+             visible="true"
+             width="210">
+                <check_box
+                 top="10"
+                 control_name="TranslateChat"
+                 enabled="true"
+                 height="16"
+                 label="Translate chat"
+                 layout="topleft"
+                 left="5"
+                 name="translate_chat_checkbox"
+                 width="230" />
+            </layout_panel>
+            <layout_panel
+             width="210"
+             layout="topleft"
+             follows="all"
+             left_delta="0"
+             top_delta="0"
+             bottom="0"
+             visible="true"
+             user_resize="false"
+             auto_resize="true"
+             name="chat_holder">      
+               <chat_history
+                font="SansSerifSmall"
+                follows="all"
+                visible="true"
+                name="chat_history"
+                parse_highlights="true"
+                parse_urls="true"
+                layout="topleft"
+                right="-5"
+                left="5"
+                top="0"
+                bottom="1">
+               </chat_history>
+            </layout_panel>
+           </layout_stack>
+           </panel>
     </layout_panel>
   </layout_stack>
+  </layout_panel>
+  <layout_panel
+             height="35"
+             layout="topleft"
+             follows="left|right|bottom"
+             left_delta="0"
+             right="0"
+             top_delta="0"
+             bottom="0"
+             visible="true"
+             user_resize="false"
+             auto_resize="false"
+             name="chat_layout_panel">
+   <layout_stack
+   animate="true" 
+   default_tab_group="2"
+   follows="all"
+   height="35"
+   right="0"
+   layout="topleft"
+   orientation="horizontal"
+   name="input_panels"
+   top_pad="0"
+   left="0">
+     <layout_panel
+             height="35"
+             layout="topleft"
+             follows="left|right|bottom"
+             left_delta="0"
+             top_delta="0"
+             bottom="0"
+             visible="true"
+             user_resize="false"
+             auto_resize="true"
+             name="input_editor_layout_panel">
+              <chat_editor
+             expand_lines_count="5"
+             follows="left|right|bottom"
+               font="SansSerifSmall"
+             visible="true"
+             height="20"
+             is_expandable="true"
+             label="To"
+             text_tentative_color="TextFgTentativeColor"
+             layout="topleft"
+             name="chat_editor"
+             max_length="1023"
+             spellcheck="true"
+             tab_group="3"
+             width="160"
+             top="6"
+             left="5"
+             right="-5"
+             wrap="true">
+            </chat_editor>
+            </layout_panel>
+            <layout_panel             
+             height="35"
+             layout="topleft"
+             follows="left|right|bottom"
+             left_delta="0"
+             top_delta="0"
+             bottom="0"
+             width="35"
+             visible="true"
+             user_resize="false"
+             auto_resize="false"
+             name="input_button_layout_panel">
+            <button
+                 follows="left|right|bottom"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_expand_one_line"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 name="minz_btn"
+                 tool_tip="Shows/hides message panel"
+                 width="28"/>
+           </layout_panel>
+  </layout_stack>
+  </layout_panel>
+  </layout_stack>
+    </view>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 81194f61cf..a7864381a9 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,8 +8,8 @@
  layout="topleft"
  name="incoming call"
  help_topic="incoming_call"
- title="Incoming call"
- width="410">
+ sound_flags="0"
+ width="550">
     <floater.string
      name="lifetime">
         5
@@ -24,7 +24,7 @@
     </floater.string>
     <floater.string
      name="VoiceInviteP2P">
-        is calling.
+        is calling you.
     </floater.string>
     <floater.string
      name="VoiceInviteAdHoc">
@@ -49,14 +49,14 @@
      image_name="icon_avatar_online.tga"
      layout="topleft"
      left_delta="19"
-     top="35"
+     top="20"
      width="36" />
     <group_icon
      enabled="false"
      follows="left|top"
      height="36"
      layout="topleft"
-     top="35"
+     top="20"
      width="36" />
     <text
      clip_partial="true"
@@ -67,43 +67,43 @@
      name="caller name"
      top="20"
      use_ellipses="true"
-     width="315"
+     width="475"
      word_wrap="true" />
-    <text
-     clip_partial="true"
-     font="SansSerif"
-     height="30"
-     layout="topleft"
-     left="77"
-     name="question"
-     top_pad="5"
-     use_ellipses="true"
-     width="315"
-     word_wrap="true">
-     Do you want to leave [CURRENT_CHAT] and join this voice chat?
-    </text>
-    <button
+     <button
      height="24"
-     label="Accept"
-     label_selected="Accept"
+     label="Answer"
+     label_selected="Answer"
      layout="topleft"
      left="70"
      name="Accept"
-     top="92"
-     width="100" />
+     top_pad="5"
+     width="120" />
     <button
      height="24"
-     label="Reject"
-     label_selected="Reject"
+     label="Ignore"
+     label_selected="Ignore"
      layout="topleft"
      name="Reject"
      left_pad="10"
-     width="100" />
+     width="120" />
     <button
      height="24"
-     label="Start IM"
+     label="Open IM instead"
      layout="topleft"
      name="Start IM"
      left_pad="10"
-     width="100" />
+     width="120" />
+    <text
+     clip_partial="true"
+     font="SansSerif"
+     height="30"
+     layout="topleft"
+     left="77"
+     name="question"
+     top_pad="5"
+     use_ellipses="true"
+     width="475"
+     word_wrap="true">
+     If you answer, you will be disconnected from your current voice conversation.
+    </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 4e7ee7913f..5e84283ab0 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="320"
- bottom="-80"
+ right="-693"
+ bottom="-50"
  legacy_header_height="18"
  can_dock="false"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 2629313069..79f2027c31 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -152,7 +152,7 @@
       </text>
       <check_box
           height="19"
-          label="World"
+          label="Test"
           layout="topleft"
           name="show_world"
           top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 08d0b00a83..701233ba4a 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -6,21 +6,21 @@
   can_resize="true"
   height="570"
   help_topic="sidebar_people"
-  min_height="440"
-  min_width="333"
+  min_height="220"
+  min_width="260"
   layout="topleft"
   name="floater_people"
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
   title="PEOPLE"
-  width="333">
+  width="370">
     <panel_container
       default_panel_name="panel_people"
       follows="all"
       height="570"
       name="main_panel"
-      width="333">
+      width="370">
       <panel
         class="panel_people"
         name="panel_people"
@@ -31,11 +31,5 @@
         filename="panel_group_info_sidetray.xml"
         label="Group Profile"
         font="SansSerifBold"/>
-      <panel
-        class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray"
-        filename="panel_block_list_sidetray.xml"
-        label="Blocked Residents &amp; Objects"
-        font="SansSerifBold"/>
     </panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5c71fd3bc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE CHAT VOLUME"
+ visible="true"
+ width="245">
+	<slider
+		control_name="AudioLevelVoice"
+		disabled_control="MuteAudio"
+		follows="left|top"
+		height="16"
+		increment="0.025"
+		initial_value="0.5"
+		label="Voice Chat"
+		label_width="50"
+		layout="topleft"
+		left="15"
+		top="50"
+		name="chat_voice_volume"
+		show_text="false"
+		slider_label.halign="right"
+		volume="true"
+		width="200">
+	</slider>
+	<button
+		control_name="MuteVoice"
+		disabled_control="MuteAudio"
+		follows="top|left"
+		height="16"
+		image_selected="AudioMute_Off"
+		image_unselected="Audio_Off"
+		is_toggle="true"
+		layout="topleft"
+		left_pad="5"
+		name="mute_audio"
+		tab_stop="false"
+		width="16" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
deleted file mode 100644
index dce2720cf8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="cascading"
- can_resize="true"
- can_minimize="true"
- can_close="true"
- chrome="true"
- height="205"
- layout="topleft"
- min_height="124"
- min_width="190"
- name="floater_voice_controls"
- help_topic="floater_voice_controls"
- title="VOICE CONTROLS"
- save_dock_state="true"
- save_visibility="true"
- save_rect="true"
- single_instance="true"
- width="282">
-    <string
-     name="title_nearby">
-        VOICE SETTINGS
-    </string>
-    <string
-     name="title_group">
-        GROUP CALL WITH [GROUP]
-    </string>
-    <string
-     name="title_adhoc">
-        CONFERENCE CALL
-    </string>
-    <string
-     name="title_peer_2_peer">
-        CALL WITH [NAME]
-    </string>
-    <string
-     name="no_one_near">
-        No one near has voice enabled
-    </string>
-      <layout_stack
-         clip="false"
-         follows="all"
-         height="189"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="my_call_stack"
-         orientation="vertical"
-         width="263">
-        <layout_panel
-         follows="top|left|right"
-         auto_resize="false"
-         layout="topleft"
-         min_height="20"
-         height="20"
-         name="my_panel">
-            <avatar_icon
-             enabled="false"
-             follows="left|top"
-             height="18"
-             default_icon_name="Generic_Person"
-             layout="topleft"
-             left="5"
-             name="user_icon"
-             top="0"
-             width="18" />
-            <text
-             follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="user_text"
-             text_color="White"
-             top="4"
-             use_ellipses="true"
-             value="My Avatar:"
-             width="210" />
-            <output_monitor
-             auto_update="true"
-             draw_border="false"
-             follows="top|right"
-             height="16"
-             layout="topleft"
-             right="-3"
-             name="speaking_indicator"
-             left_pad="5"
-             visible="true"
-             width="20" />
-        </layout_panel>
-        <layout_panel name="leave_call_panel" height="26" min_height="26" auto_resize="false">
-        <layout_stack
-         clip="true"
-         follows="left|top|right"
-         height="26"
-         layout="topleft"
-         mouse_opaque="false"
-         name="voice_effect_and_leave_call_stack"
-         orientation="horizontal"
-         width="262">
-          <layout_panel
-            height="26"
-            width="200">
-            <panel
-             class="panel_voice_effect"
-             name="panel_voice_effect"
-             visiblity_control="VoiceMorphingEnabled"
-             filename="panel_voice_effect.xml" />
-          </layout_panel>
-          <layout_panel
-           auto_resize="false"
-           follows="top|right"
-           height="23"
-           visible="true"
-           layout="topleft"
-           name="leave_call_btn_panel"
-           width="100">
-            <button
-             follows="right|top"
-             height="23"
-             label="Leave Call"
-             name="leave_call_btn"
-             width="100" />
-          </layout_panel>
-        </layout_stack>
-          </layout_panel>
-      <layout_panel
-          follows="all"
-          layout="topleft"
-          left="2"
-          top_pad="0"
-          height="132"
-          name="callers_panel"
-          auto_resize="true"
-          width="280">
-        <avatar_list
-         follows="all"
-         height="132"
-         ignore_online_status="true"
-         layout="topleft"
-         multi_select="true"
-         name="speakers_list"
-         width="280" />
-        <panel
-         filename="panel_avatar_list_item.xml"
-         follows="left|right|top"
-         height="24"
-         layout="topleft"
-         left="0"
-         name="non_avatar_caller"
-         top="10"
-         width="276" />
-      </layout_panel>
-    </layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 35cb2670d0..146c3d7e30 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -5,12 +5,13 @@
  height="500"
  name="voice_effects"
  help_topic="voice_effects"
- title="VOICE MORPHING"
+ title="VOICE MORPHING PREVIEW"
  background_visible="true"
  label="Places"
  layout="topleft"
  min_height="360"
  min_width="200"
+ save_rect="true"
  width="300">
   <string name="no_voice_effect">
     (No Voice Morph)
diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
new file mode 100644
index 0000000000..9346295d5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE VOLUME"
+ visible="true"
+ width="245">
+    <text
+     follows="top|left|right"
+     font="SansSerifSmall"
+     height="21"
+     left="10"
+     name="avatar_name"
+     parse_urls="false"
+     top="35"
+     text_color="White"
+     translate="false"
+     use_ellipses="true"
+     value="TestString PleaseIgnore"
+     width="225" />
+    <slider
+     follows="top|left"
+     height="23"
+     increment="0.01"
+     left="1"
+     max_val="0.95"
+     min_val="0.05"
+     name="volume_slider"
+     show_text="false"
+     tool_tip="Voice volume"
+     top_pad="0"
+     value="0.5"
+     width="200" />
+    <button
+     follows="top|left"
+     height="16"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     left_pad="0"
+     top_delta="4"
+     name="mute_btn"
+     width="16" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index bc3bcd331b..ef4f19cd4c 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -2,14 +2,14 @@
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
--->
+--> 
 <floater
  legacy_header_height="25"
  bevel_style="in"
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="164"
+ height="160"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
@@ -98,13 +98,13 @@
      follows="top|left"
      height="23"
      increment="0.01"
-     left="1"
+     left="10"
      max_val="0.95"
      min_val="0.05"
      name="volume_slider"
      show_text="false"
      tool_tip="Voice volume"
-     top_pad="0"
+     top_pad="5"
      value="0.5"
      width="200" />
     <button
@@ -116,10 +116,21 @@
      image_selected="AudioMute_Off"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="0"
+     left_pad="5"
      top_delta="4"
      name="mute_btn"
      width="16" />
+    <text
+     follows="top|left"
+     height="16"
+     left="8"
+     name="avatar_profile_link"
+     font="SansSerifSmall"
+     text_color="White"
+     top_pad="5"
+     translate="false"
+     value="[[LINK] View full profile]"
+     width="175" />
     <avatar_icon
      follows="top|left"
      height="38"
@@ -130,83 +141,4 @@
      name="avatar_icon"
      top="10"
      width="38" />
-<!-- Overlapping buttons for default actions
-    llinspectavatar.cpp makes visible the most likely default action 
--->
-    <button
-     follows="top|left"
-     height="20"
-     label="Add Friend"
-     left="8"
-     top="135"
-     name="add_friend_btn"
-     width="90" />
-    <button
-     follows="top|left"
-     height="20"
-     label="IM"
-     left_delta="0"
-     top_delta="0"
-     name="im_btn"
-     width="80"
-     commit_callback.function="InspectAvatar.IM"/>
-	<button
-     follows="top|left"
-     height="20"
-     label="Profile"
-     layout="topleft"
-     name="view_profile_btn"
-     left_delta="96"
-     top_delta="0"
-     tab_stop="false"
-     width="80" />
-      <!--  gear buttons here -->
-  <menu_button
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_avatar_gear.xml"
-     name="gear_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-	<menu_button
-     follows="top|left"
-     height="20"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_self_gear.xml"
-     name="gear_self_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-  <panel 
-    follows="top|left" 
-    top="164" 
-    left="0" 
-    height="60" 
-    width="228" 
-    visible="false"
-    background_visible="true"
-    name="moderator_panel"
-    background_opaque="true" 
-    bg_opaque_color="MouseGray">
-    <button
-      name="disable_voice"
-      label="Disable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      commit_callback.function="InspectAvatar.DisableVoice"/>
-    <button
-      name="enable_voice"
-      label="Enable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      visible="false" 
-      commit_callback.function="InspectAvatar.EnableVoice"/>
-  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
index a6e9a40e31..45cf780557 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
@@ -9,5 +9,5 @@
     <menu
      label="New Body Parts"
      layout="topleft"
-     name="COF.Geear.New_Body_Parts" />
+     name="COF.Gear.New_Body_Parts" />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
new file mode 100644
index 0000000000..5a13ef0a59
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_conversation_participant"
+ visible="false">
+     <menu_item_call
+     label="Close conversation"
+     layout="topleft"
+     name="close_conversation">
+        <on_click function="Avatar.DoToSelected" parameter="close_conversation"/>
+	 </menu_item_call>
+     <menu_item_call
+     label="Open voice conversation"
+     layout="topleft"
+     name="open_voice_conversation">
+        <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
+     </menu_item_call>	
+     <menu_item_call
+     label="Disconnect from voice"
+     layout="topleft"
+     name="disconnect_from_voice">
+        <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/>
+    </menu_item_call>	
+	<menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/>	
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="view_profile">
+        <on_click function="Avatar.DoToSelected" parameter="view_profile"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_view_profile"/>
+    </menu_item_call>
+    <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="im">
+        <on_click function="Avatar.DoToSelected" parameter="im"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_im"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Offer teleport"
+     layout="topleft"
+     name="offer_teleport">
+        <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="voice_call">
+        <on_click function="Avatar.DoToSelected" parameter="voice_call"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_call" />
+    </menu_item_call>
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="chat_history">
+        <on_click function="Avatar.DoToSelected" parameter="chat_history"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_chat_history"/>
+    </menu_item_call>	
+    <menu_item_separator layout="topleft" name="separator_chat_history"/>	
+    <menu_item_call
+     label="Add friend"
+     layout="topleft"
+     name="add_friend">
+        <on_click function="Avatar.DoToSelected" parameter="add_friend"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableItem" parameter="can_delete" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Remove friends"
+     layout="topleft"
+     name="remove_friends">
+        <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableItem" parameter="can_delete" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="invite_to_group">
+        <on_click function="Avatar.DoToSelected" parameter="invite_to_group" />
+        <on_enable function="Avatar.EnableItem" parameter="can_invite" />
+    </menu_item_call>
+    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>
+    <menu_item_call
+     label="Zoom In"
+     layout="topleft"
+     name="zoom_in">
+      <on_click function="Avatar.DoToSelected" parameter="zoom_in" />
+      <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" />
+    </menu_item_call>
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="map">
+        <on_click function="Avatar.DoToSelected" parameter="map" />
+        <on_enable function="Avatar.EnableItem" parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="share">
+        <on_click function="Avatar.DoToSelected" parameter="share" />
+        <on_enable function="Avatar.EnableItem" parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="pay">
+        <on_click function="Avatar.DoToSelected" parameter="pay" />
+        <on_enable function="Avatar.EnableItem" parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block Voice"
+     layout="topleft"
+     name="block_unblock">
+        <on_click function="Avatar.DoToSelected" parameter="block_unblock" />
+		<on_check function="Avatar.CheckItem" parameter="is_blocked" />
+		<on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="MuteText">
+     <on_click function="Avatar.DoToSelected" parameter="mute_unmute" />
+     <on_check function="Avatar.CheckItem" parameter="is_muted" />
+     <on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_call
+     label="Group Profile"
+     layout="topleft"
+     name="group_profile">
+        <on_click function="Group.DoToSelected" parameter="group_profile"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_group_profile" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Activate Group"
+     layout="topleft"
+     name="activate_group">
+        <on_click function="Group.DoToSelected" parameter="activate_group"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_activate_group" />
+    </menu_item_call>		
+    <menu_item_call
+     label="Leave Group"
+     layout="topleft"
+     name="leave_group">
+        <on_click function="Group.DoToSelected" parameter="leave_group"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_leave_group" />
+    </menu_item_call>
+	<menu_item_separator layout="topleft" name="Moderator Options Separator"/>
+	<context_menu
+	 label="Moderator Options"
+	 layout="topleft"
+	 name="Moderator Options">
+		<menu_item_check
+		 label="Allow text chat"
+		 layout="topleft"
+		 name="AllowTextChat">
+			<on_check function="Avatar.CheckItem" parameter="is_allowed_text_chat" />
+			<on_click function="Avatar.DoToSelected" parameter="toggle_allow_text_chat" />
+			<on_enable function="Avatar.EnableItem" parameter="can_allow_text_chat" />
+		</menu_item_check>
+		<menu_item_separator layout="topleft" name="moderate_voice_separator" />
+		<menu_item_call
+		 label="Mute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceMuteSelected">
+			<on_click function="Avatar.DoToSelected" parameter="selected" />
+      <on_enable function="Avatar.EnableItem" parameter="can_mute" />
+      <on_visible function="Avatar.VisibleItem" parameter="show_mute" />
+    </menu_item_call>
+    <menu_item_call
+		 label="Unmute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceUnMuteSelected">
+      <on_click function="Avatar.DoToSelected" parameter="selected" />
+      <on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+      <on_visible function="Avatar.VisibleItem" parameter="show_unmute" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Mute everyone"
+		 layout="topleft"
+		 name="ModerateVoiceMute">
+			<on_click function="Avatar.DoToSelected" parameter="mute_all" />
+			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Unmute everyone"
+		 layout="topleft"
+		 name="ModerateVoiceUnmute">
+			<on_click function="Avatar.DoToSelected" parameter="unmute_all" />
+			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
+		</menu_item_call>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..8796b87955
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Context Menu">
+    <menu_item_call
+     label="IM..."
+     layout="topleft"
+     name="IM">
+        <on_click
+         function="Calllog.Action"
+         parameter="im" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call..."
+     layout="topleft"
+     name="Call">
+        <on_click
+         function="Calllog.Action"
+         parameter="call" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_call" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open chat history..."
+     layout="topleft"
+     name="Chat history">
+        <on_click
+         function="Calllog.Action"
+         parameter="chat_history" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_view_chat_history" />
+    </menu_item_call>
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <on_click
+         function="Calllog.Action"
+         parameter="view_profile" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_view_profile" />
+    </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <on_click
+       function="Calllog.Action"
+       parameter="offer_teleport"/>
+      <on_enable
+      function="Calllog.Enable"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="add_friend">
+        <on_click
+         function="Calllog.Action"
+         parameter="add_friend"/>
+        <on_visible
+         function="Calllog.Check"
+         parameter="is_not_friend" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove Friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click
+         function="Calllog.Action"
+         parameter="remove_friend"/>
+        <on_visible
+         function="Calllog.Check"
+         parameter="is_friend" />
+    </menu_item_call>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="Invite">
+        <on_click
+         function="Calllog.Action"
+         parameter="invite_to_group"/>
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_invite_to_group" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="Map">
+        <on_click
+         function="Calllog.Action"
+         parameter="show_on_map" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <on_click
+         function="Calllog.Action"
+         parameter="share" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <on_click
+         function="Calllog.Action"
+         parameter="pay" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block/Unblock"
+     layout="topleft"
+     name="Block/Unblock">
+        <menu_item_check.on_click
+         function="Calllog.Action"
+         parameter="block"/>
+        <menu_item_check.on_check
+         function="Calllog.Check"
+         parameter="is_blocked" />
+        <menu_item_check.on_enable
+         function="Calllog.Enable"
+         parameter="can_block" />
+    </menu_item_check>
+
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..ce65b23971
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_conversation_view"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by name"
+   name="sort_by_name">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_by_name"/>
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_by_name"/>
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by date"
+   name="sort_by_date">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_by_date" />
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_by_date" />
+  </menu_item_check>
+  <menu_item_separator />
+  <menu_item_check
+   label="Sort friends on top"
+   name="sort_by_friends">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_friends_on_top" />
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_friends_on_top" />
+  </menu_item_check>
+  <menu_item_separator />
+  <menu_item_call
+   label="View Nearby chat history..."
+   name="view_nearby_chat_history">
+      <on_click
+       function="CallLog.Action"
+       parameter="view_nearby_chat_history" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
index fce7414d80..eca9e7f3c9 100644
--- a/indra/newview/skins/default/xui/en/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_group_plus"
+<toggleable_menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
   <menu_item_call name="item_join" label="Join Group...">
@@ -8,4 +8,4 @@
   <menu_item_call name="item_new" label="New Group...">
     <menu_item_call.on_click function="People.Group.Plus.Action" userdata="new_group" />
   </menu_item_call>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
new file mode 100644
index 0000000000..43287c6ec3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Gear Menu">
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <on_click function="Avatar.GearDoToSelected" parameter="view_profile" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_view_profile" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="Add Friend">
+        <on_click function="Avatar.GearDoToSelected" parameter="add_friend" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click function="Avatar.GearDoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Offer teleport"
+     layout="topleft"
+     name="offer_teleport">
+        <on_click function="Avatar.GearDoToSelected" parameter="offer_teleport"/>
+        <on_enable function="Avatar.EnableGearItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="invite_to_group">
+        <on_click function="Avatar.GearDoToSelected" parameter="invite_to_group" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_invite" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="View Icons Separator" />
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="chat_history">
+        <on_click function="Avatar.GearDoToSelected" parameter="chat_history"/>
+        <on_enable function="Avatar.EnableGearItem" parameter="can_chat_history"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_call
+       label="Zoom In"
+       layout="topleft"
+       name="zoom_in">
+      <on_click function="Avatar.DoToSelected" parameter="zoom_in" />
+      <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" />
+    </menu_item_call>
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="map">
+        <on_click function="Avatar.GearDoToSelected" parameter="map" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <on_click function="Avatar.GearDoToSelected" parameter="share" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <on_click function="Avatar.GearDoToSelected" parameter="pay" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_check
+     label="Block Voice"
+     layout="topleft"
+     name="Block/Unblock">
+        <on_check function="Avatar.CheckGearItem" parameter="is_blocked" />
+        <on_click function="Avatar.GearDoToSelected" parameter="block_unblock" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="MuteText">
+        <on_check function="Avatar.CheckGearItem" parameter="is_muted" />
+        <on_click function="Avatar.GearDoToSelected" parameter="mute_unmute" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft"/>
+</toggleable_menu>
+
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..b0adca0e0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_modes"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+       label="Compact view"
+       name="compact_view">
+      <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="compact_view"/>
+      <menu_item_check.on_check
+         function="IMSession.Menu.CompactExpandedModes.CheckItem"
+         parameter="compact_view"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Expanded view"
+       name="expanded_view">
+      <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="expanded_view"/>
+      <menu_item_check.on_check
+         function="IMSession.Menu.CompactExpandedModes.CheckItem"
+         parameter="expanded_view"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="IMShowTime" label="Show time">
+        <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="IMShowTime" />
+        <menu_item_check.on_check
+         function="IMSession.Menu.ShowModes.CheckItem"
+         parameter="IMShowTime" />
+        <menu_item_check.on_enable
+         function="IMSession.Menu.ShowModes.Enable"
+         parameter="IMShowTime" />
+    </menu_item_check>
+    <menu_item_check name="IMShowNamesForP2PConv" label="Show names in one-to-one conversations">
+        <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="IMShowNamesForP2PConv" />
+        <menu_item_check.on_check
+         function="IMSession.Menu.ShowModes.CheckItem"
+         parameter="IMShowNamesForP2PConv" />
+        <menu_item_check.on_enable
+         function="IMSession.Menu.ShowModes.Enable"
+         parameter="IMShowNamesForP2PConv" />    
+    </menu_item_check>      
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_im_well_button.xml b/indra/newview/skins/default/xui/en/menu_im_well_button.xml
deleted file mode 100644
index f8dfba91ff..0000000000
--- a/indra/newview/skins/default/xui/en/menu_im_well_button.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu
- layout="topleft"
- name="IM Well Button Context Menu">
-    <menu_item_call
-     label="Close All"
-     layout="topleft"
-     name="Close All">
-        <menu_item_call.on_click
-         function="IMWellChicletMenu.Action"
-         parameter="close all" />
-        <menu_item_call.on_enable
-         function="IMWellChicletMenu.EnableItem"
-         parameter="can close all" />
-    </menu_item_call>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 76b188220d..0000000000
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu
-         create_jump_keys="true"
-         layout="topleft"
-         mouse_opaque="false"
-         visible="false"
-         name="Gear Menu">
-  <menu_item_call
-   label="View Profile"
-   enabled="true" 
-   name="view_profile">
-    <menu_item_call.on_click
-     function="InspectAvatar.ViewProfile"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Add Friend"
-   name="add_friend">
-    <menu_item_call.on_click
-     function="InspectAvatar.AddFriend"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.Enable"/>
-  </menu_item_call>
-  <menu_item_call
-   label="IM"
-   name="im">
-    <menu_item_call.on_click
-     function="InspectAvatar.IM"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Call"
-   enabled="true"
-   name="call">
-    <menu_item_call.on_click
-     function="InspectAvatar.Call"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.EnableCall"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Teleport"
-   name="teleport">
-    <menu_item_call.on_click
-     function="InspectAvatar.Teleport"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.EnableTeleportOffer"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Invite to Group"
-   name="invite_to_group">
-    <menu_item_call.on_click
-     function="InspectAvatar.InviteToGroup"/>
-  </menu_item_call>
-  <menu_item_separator />
-  <menu_item_call
-   label="Block"
-   name="block">
-    <menu_item_call.on_click
-     function="InspectAvatar.ToggleMute"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableMute" />
-  </menu_item_call>
-  <menu_item_call
-   label="Unblock"
-   name="unblock">
-    <menu_item_call.on_click
-     function="InspectAvatar.ToggleMute"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableUnmute" />
-  </menu_item_call>
-  <menu_item_call
-   label="Report"
-   name="report">
-    <menu_item_call.on_click
-     function="InspectAvatar.Report"/>
-  </menu_item_call>  
-  <menu_item_call
-   label="Freeze"
-   name="freeze">
-    <menu_item_call.on_click
-     function="InspectAvatar.Freeze"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFreeze"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Eject"
-   name="eject">
-    <menu_item_call.on_click
-     function="InspectAvatar.Eject"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleEject"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Kick"
-   name="kick">
-    <menu_item_call.on_click
-     function="InspectAvatar.Kick"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableGod"/>
-  </menu_item_call>
-  <menu_item_call
-  label="CSR"
-  name="csr">
-    <menu_item_call.on_click
-     function="InspectAvatar.CSR" />
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableGod" />
-  </menu_item_call>
-  <menu_item_call
-   label="Debug Textures"
-   name="debug">
-    <menu_item_call.on_click
-     function="Avatar.Debug"/>
-    <menu_item_call.on_visible
-     function="IsGodCustomerService"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Find On Map"
-   name="find_on_map">
-    <menu_item_call.on_click
-     function="InspectAvatar.FindOnMap"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFindOnMap"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Zoom In"
-   name="zoom_in">
-    <menu_item_call.on_click
-     function="InspectAvatar.ZoomIn"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleZoomIn"/>
-  </menu_item_call>  
-  <menu_item_call
-   label="Pay"
-   name="pay">
-    <menu_item_call.on_click
-     function="InspectAvatar.Pay"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Share"
-   name="share">
-    <menu_item_call.on_click
-     function="InspectAvatar.Share"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
deleted file mode 100644
index 5e7b16ed4a..0000000000
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Self Pie">
-  <menu_item_call
-   label="Sit Down"
-   layout="topleft"
-   name="Sit Down Here">
-    <menu_item_call.on_click
-     function="Self.SitDown"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableSitDown" />
-  </menu_item_call>
-  <menu_item_call
-   label="Stand Up"
-   layout="topleft"
-   name="Stand Up">
-    <menu_item_call.on_click
-     function="Self.StandUp"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableStandUp" />
-  </menu_item_call>
-  <context_menu
-   label="Take Off"
-   layout="topleft"
-   name="Take Off &gt;">
-    <context_menu
-     label="Clothes"
-     layout="topleft"
-     name="Clothes &gt;">
-      <menu_item_call
-       enabled="false"
-       label="Shirt"
-       layout="topleft"
-       name="Shirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Pants"
-       layout="topleft"
-       name="Pants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="pants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Skirt"
-       layout="topleft"
-       name="Skirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="skirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Shoes"
-       layout="topleft"
-       name="Shoes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shoes" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Socks"
-       layout="topleft"
-       name="Socks">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="socks" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Jacket"
-       layout="topleft"
-       name="Jacket">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="jacket" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Gloves"
-       layout="topleft"
-       name="Gloves">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="gloves" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-            enabled="false"
-            label="Undershirt"
-            layout="topleft"
-            name="Self Undershirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="undershirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Underpants"
-        layout="topleft"
-        name="Self Underpants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="underpants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Tattoo"
-        layout="topleft"
-        name="Self Tattoo">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="tattoo" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Alpha"
-        layout="topleft"
-        name="Self Alpha">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="alpha" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_separator
-       layout="topleft" />
-      <menu_item_call
-       label="All Clothes"
-       layout="topleft"
-       name="All Clothes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="all" />
-      </menu_item_call>
-    </context_menu>
-    <context_menu
-     label="HUD"
-     layout="topleft"
-     name="Object Detach HUD" />
-    <context_menu
-     label="Detach"
-     layout="topleft"
-     name="Object Detach" />
-    <menu_item_call
-     label="Detach All"
-     layout="topleft"
-     name="Detach All">
-      <menu_item_call.on_click
-       function="Self.RemoveAllAttachments"
-       parameter="" />
-      <menu_item_call.on_enable
-       function="Self.EnableRemoveAllAttachments" />
-    </menu_item_call>
-  </context_menu>
-  <menu_item_call
-  label="Change Outfit"
-  layout="topleft"
-  name="Chenge Outfit">
-    <menu_item_call.on_click
-     function="CustomizeAvatar" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit My Outfit"
-  layout="topleft"
-  name="Edit Outfit">
-    <menu_item_call.on_click
-     function="EditOutfit" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit My Shape"
-  layout="topleft"
-  name="Edit My Shape">
-    <menu_item_call.on_click
-     function="EditShape" />
-    <menu_item_call.on_enable
-     function="Edit.EnableEditShape" />
-  </menu_item_call>
-  <menu_item_call
-    label="My Friends"
-    layout="topleft"
-    name="Friends...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="friends_panel" />
-  </menu_item_call>
-  <menu_item_call
-   label="My Groups"
-   layout="topleft"
-   name="Groups...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="groups_panel" />
-  </menu_item_call>
-  <menu_item_call
-    label="My Profile"
-    layout="topleft"
-    name="Profile...">
-    <menu_item_call.on_click
-     function="ShowAgentProfile"
-     parameter="agent" />
-  </menu_item_call>
-  <menu_item_call
-   label="Debug Textures"
-       name="Debug...">
-    <menu_item_call.on_click
-     function="Avatar.Debug" />
-    <menu_item_call.on_visible
-     function="IsGodCustomerService"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index 0c8a2af002..2d4f1792c2 100644
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -24,4 +24,22 @@
          function="ObjectIcon.Action"
          parameter="block" />
     </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action" 
+         parameter="map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport to Object Location"
+     layout="topleft"
+     name="teleport_to_object">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="teleport" />
+    </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
new file mode 100644
index 0000000000..7ea87ee05c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="participant_manu_view">
+    <menu_item_check
+     label="Sort conversations by type"
+     layout="topleft"
+     name="sort_sessions_by_type">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_type" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_type" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort conversations by name"
+     layout="topleft"
+     name="sort_sessions_by_name">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_name" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort conversations by recent activity"
+     layout="topleft"
+     name="sort_sessions_by_recent">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_recent" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_recent" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_check
+     label="Sort participants by name"
+     layout="topleft"
+     name="sort_participants_by_name">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_name" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort participants by recent activity"
+     layout="topleft"
+     name="sort_participants_by_recent">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_recent" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_recent" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+         label="Chat preferences..."
+         name="chat_preferences">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="chat_preferences" />
+      </menu_item_call>
+    <menu_item_call
+         label="Privacy preferences..."
+         name="privacy_preferences">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="privacy_preferences" />
+    </menu_item_call>
+    <menu_item_check
+         label="Conversation log..."
+         name="Conversation"
+         visible="true">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="conversation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="conversation" />
+        <menu_item_check.on_enable
+         function="Avatar.EnableItem"
+         parameter="conversation_log" />
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="Translate_chat" label="Translate Nearby chat">
+        <menu_item_check.on_click
+         function="IMFloaterContainer.Action" 
+         parameter="Translating.Toggle" />
+        <menu_item_check.on_check
+         function="IMFloaterContainer.Check" 
+         parameter="Translating.On" />
+        <menu_item_check.on_enable
+         function="IMFloaterContainer.Check" 
+         parameter="Translating.Enabled" />
+    </menu_item_check>
+    <menu_item_check name="Translation_settings" label="Translation settings...">
+    <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="prefs_translation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="prefs_translation" />
+    </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..63295ea27b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_gear"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Unblock"
+   name="unblock">
+      <on_click
+       function="Block.Action"
+       parameter="unblock_item" />
+      <on_enable
+       function="Block.Enable"
+       parameter="unblock_item" /> 
+  </menu_item_call>
+  <menu_item_call
+   label="Profile..."
+   name="profile">
+      <on_click
+       function="Block.Action"
+       parameter="profile_item"/>
+      <on_enable
+       function="Block.Enable"
+       parameter="profile_item" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..0c7155667e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Block Resident by name..."
+   name="block_resident_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="block_res_by_name"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Block object by name"
+   name="block_object_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="block_obj_by_name"/>
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..2efb70ee37
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_view"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by name"
+   name="sort_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="sort_by_name"/>
+      <on_check
+       function="Block.Check"
+       parameter="sort_by_name"/>
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by type"
+   name="sort_by_type">
+      <on_click
+       function="Block.Action"
+       parameter="sort_by_type" />
+      <on_check
+       function="Block.Check"
+       parameter="sort_by_type" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
new file mode 100644
index 0000000000..dde9432867
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Status"
+   name="sort_status">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_status" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_status" />
+  </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowIcons" />
+  </menu_item_check>
+  <menu_item_check name="view_permissions" label="View Permissions Granted">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_permissions" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowPermissions" />
+  </menu_item_check>
+  <menu_item_check name="view_conversation" label="View Conversation Log...">
+    <menu_item_check.on_check
+     function="Floater.Visible"
+     parameter="conversation" />
+    <menu_item_check.on_click
+     function="Floater.Toggle"
+     parameter="conversation" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
deleted file mode 100644
index b452f96e7a..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Sort by Name"
-   name="sort_name">
-      <menu_item_check.on_click
-       function="People.Friends.ViewSort.Action"
-       parameter="sort_name" />
-      <menu_item_check.on_check
-       function="People.Friends.ViewSort.CheckItem"
-       parameter="sort_name" />
-  </menu_item_check>
-  <menu_item_check
-   label="Sort by Status"
-   name="sort_status">
-      <menu_item_check.on_click
-       function="People.Friends.ViewSort.Action"
-       parameter="sort_status" />
-      <menu_item_check.on_check
-       function="People.Friends.ViewSort.CheckItem"
-       parameter="sort_status" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Friends.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="FriendsListShowIcons" />
-  </menu_item_check>
-  <menu_item_check name="view_permissions" label="View Permissions Granted">
-    <menu_item_check.on_click
-     function="People.Friends.ViewSort.Action"
-     parameter="view_permissions" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="FriendsListShowPermissions" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index 8f89d37dbb..1e0364b84e 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_group_plus"
+<toggleable_menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
  mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
+  <menu_item_call
+   label="Activate"
+   name="Activate">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="activate" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="activate" />
+  </menu_item_call>
   <menu_item_call
    label="View Info"
    name="View Info">
@@ -23,7 +33,7 @@
      parameter="chat" />
   </menu_item_call>
   <menu_item_call
-   label="Call"
+   label="Voice call"
    name="Call">
     <menu_item_call.on_click
      function="People.Groups.Action"
@@ -33,17 +43,6 @@
      parameter="call" />
   </menu_item_call>
   <menu_item_separator />
-  <menu_item_call
-   label="Activate"
-   name="Activate">
-    <menu_item_call.on_click
-     function="People.Groups.Action"
-     parameter="activate" />
-    <menu_item_call.on_enable
-     function="People.Groups.Enable"
-     parameter="activate" />
-  </menu_item_call>
-  <menu_item_separator />
   <menu_item_call
    label="Leave"
    name="Leave">
@@ -54,4 +53,4 @@
      function="People.Groups.Enable"
      parameter="leave" />
   </menu_item_call>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
new file mode 100644
index 0000000000..73f79f1e70
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Display Group Icons"
+   layout="topleft"
+   name="Display Group Icons">
+      <menu_item_check.on_click
+       function="People.Groups.ViewSort.Action"
+       parameter="show_icons" />
+      <menu_item_check.on_check
+       function="CheckControl"
+       parameter="GroupListShowIcons" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
deleted file mode 100644
index c710fe3b9b..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu 
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Display Group Icons"
-   layout="topleft"
-   name="Display Group Icons">
-      <menu_item_check.on_click
-       function="People.Groups.ViewSort.Action"
-       parameter="show_icons" />
-      <menu_item_check.on_check
-       function="CheckControl"
-       parameter="GroupListShowIcons" />
-  </menu_item_check>
-  <menu_item_call
-   label="Leave Selected Group"
-   layout="topleft"
-   name="Leave Selected Group">
-      <menu_item_call.on_click
-       function="People.Group.Minus.Action"/>
-      <menu_item_call.on_enable
-       function="People.Group.Minus.Enable"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index d2e35e4cc0..3abb5f7bc8 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -1,28 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
  layout="topleft"
- name="Avatar Context Menu">
+ name="Nearby People Context Menu">
     <menu_item_call
      label="View Profile"
      layout="topleft"
-     name="View Profile">
+     name="view_profile">
         <menu_item_call.on_click
          function="Avatar.Profile" />
     </menu_item_call>
+    <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="im">
+        <menu_item_call.on_click
+         function="Avatar.IM" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_im"/> 
+    </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="offer_teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="voice_call">
+        <menu_item_call.on_click
+         function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_call" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="View chat history..."
+     layout="topleft"
+     name="chat_history">
+        <menu_item_call.on_click
+         function="Avatar.Calllog" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_callog"/>
+    </menu_item_call>
+    <menu_item_separator name="separator_chat_history"/>
     <menu_item_call
      label="Add Friend"
      layout="topleft"
-     name="Add Friend">
+     name="add_friend">
         <menu_item_call.on_click
          function="Avatar.AddFriend" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Avatar.EnableItem"
          parameter="can_add" />
     </menu_item_call>
     <menu_item_call
      label="Remove Friend"
      layout="topleft"
-     name="Remove Friend">
+     name="remove_friend">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
         <menu_item_call.on_enable
@@ -30,26 +71,30 @@
          parameter="can_delete" />
     </menu_item_call>
     <menu_item_call
-     label="IM"
+     label="Invite to group..."
      layout="topleft"
-     name="IM">
+     name="invite_to_group">
         <menu_item_call.on_click
-         function="Avatar.IM" />
+         function="Avatar.InviteToGroup" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_invite"/>
     </menu_item_call>
+    <menu_item_separator name="separator_invite_to_group"/>
     <menu_item_call
-     label="Call"
+     label="Zoom In"
      layout="topleft"
-     name="Call">
-        <menu_item_call.on_click
-         function="Avatar.Call" />
-        <menu_item_call.on_enable
-         function="Avatar.EnableItem"
-         parameter="can_call" />
+     name="zoom_in">
+      <menu_item_call.on_click
+       function="Avatar.ZoomIn" />
+      <menu_item_call.on_enable
+       function="Avatar.EnableItem"
+       parameter="can_zoom_in"/>
     </menu_item_call>
     <menu_item_call
      label="Map"
      layout="topleft"
-     name="Map">
+     name="map">
         <menu_item_call.on_click
          function="Avatar.ShowOnMap" />
         <menu_item_call.on_enable
@@ -59,21 +104,27 @@
     <menu_item_call
      label="Share"
      layout="topleft"
-     name="Share">
+     name="share">
         <menu_item_call.on_click
          function="Avatar.Share" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_share"/>
     </menu_item_call>
     <menu_item_call
      label="Pay"
      layout="topleft"
-     name="Pay">
+     name="pay">
         <menu_item_call.on_click
          function="Avatar.Pay" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_pay"/> 
     </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
-     name="Block/Unblock">
+     name="block_unblock">
         <menu_item_check.on_click
          function="Avatar.BlockUnblock" />
         <menu_item_check.on_check
@@ -83,13 +134,5 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-    <menu_item_call
-    label="Offer Teleport"
-    name="teleport">
-      <menu_item_call.on_click
-       function="Avatar.OfferTeleport"/>
-      <menu_item_call.on_enable
-      function="Avatar.EnableItem"
-      parameter="can_offer_teleport"/>
-    </menu_item_call>
+    <menu_item_separator />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 5d58a9d289..5f973088fd 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -6,7 +6,7 @@
      enabled="false"
      label="Add Friends"
      layout="topleft"
-     name="Add Friends">
+     name="add_friends">
         <on_click
          function="Avatar.AddFriends" />
         <on_enable
@@ -16,7 +16,7 @@
     <menu_item_call
      label="Remove Friends"
      layout="topleft"
-     name="Remove Friend">
+     name="remove_friends">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
         <menu_item_call.on_enable
@@ -26,7 +26,7 @@
     <menu_item_call
      label="IM"
      layout="topleft"
-     name="IM">
+     name="im">
         <on_click
          function="Avatar.IM" />
     </menu_item_call>
@@ -34,7 +34,7 @@
      enabled="false"
      label="Call"
      layout="topleft"
-     name="Call">
+     name="call">
         <on_click
          function="Avatar.Call" />
         <on_enable
@@ -45,7 +45,7 @@
      enabled="false"
      label="Share"
      layout="topleft"
-     name="Share">
+     name="share">
         <on_click
          function="Avatar.Share" />
     </menu_item_call>
@@ -53,13 +53,13 @@
      enabled="false"
      label="Pay"
      layout="topleft"
-     name="Pay">
+     name="pay">
         <on_click
          function="Avatar.Pay" />
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
-    name="teleport">
+    name="offer_teleport">
       <menu_item_call.on_click
        function="Avatar.OfferTeleport"/>
       <menu_item_call.on_enable
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..da88ca9f4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_group_plus"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+       label="Sort by Recent Speakers"
+       name="sort_by_recent_speakers">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+       parameter="sort_by_recent_speakers"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_by_recent_speakers"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Sort by Name"
+       name="sort_name">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="sort_name"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_name"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Sort by Distance"
+       name="sort_distance">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="sort_distance"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_distance"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="view_icons" label="View People Icons">
+        <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="view_icons" />
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="NearbyListShowIcons" />
+    </menu_item_check>
+    <menu_item_check name ="view_map" label="View Map">
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="NearbyListShowMap" />
+        <menu_item_check.on_click
+         function="ToggleControl"
+         parameter="NearbyListShowMap" />
+    </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 614dd693c5..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-     label="Sort by Recent Speakers"
-     name="sort_by_recent_speakers">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_by_recent_speakers"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_by_recent_speakers"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Name"
-     name="sort_name">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_name"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_name"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Distance"
-     name="sort_distance">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_distance"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_distance"/>
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Nearby.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="NearbyListShowIcons" />
-  </menu_item_check>
-  <menu_item_check name ="view_map" label="View Map">
-    <menu_item_check.on_check
-      function="CheckControl"
-      parameter="NearbyListShowMap" />
-    <menu_item_check.on_click
-      function="ToggleControl"
-      parameter="NearbyListShowMap" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
new file mode 100644
index 0000000000..1dbc90dd2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by Most Recent"
+   name="sort_most">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_recent" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_recent" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Recent.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="RecentListShowIcons" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
deleted file mode 100644
index 485a5a658c..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu 
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-   label="Sort by Most Recent"
-   name="sort_most">
-      <menu_item_check.on_click
-       function="People.Recent.ViewSort.Action"
-       parameter="sort_recent" />
-      <menu_item_check.on_check
-       function="People.Recent.ViewSort.CheckItem"
-       parameter="sort_recent" />
-  </menu_item_check>
-  <menu_item_check
-   label="Sort by Name"
-   name="sort_name">
-      <menu_item_check.on_click
-       function="People.Recent.ViewSort.Action"
-       parameter="sort_name" />
-      <menu_item_check.on_check
-       function="People.Recent.ViewSort.CheckItem"
-       parameter="sort_name" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Recent.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="RecentListShowIcons" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index 73f0fa7979..7cd56f257a 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
  layout="topleft"
- name="Url Popup">
+ name="Url Popup">  
     <menu_item_call
-     label="Show Resident Profile"
+     label="View Profile"
      layout="topleft"
      name="show_agent">
         <menu_item_call.on_click
-         function="Url.ShowProfile" />
+         function="Url.ShowProfile" />         
+    </menu_item_call>
+    <menu_item_call
+     label="Send IM..."
+     layout="topleft"
+     name="send_im">
+        <menu_item_call.on_click
+         function="Url.SendIM" />        
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend..."
+     layout="topleft"
+     name="add_friend">
+        <menu_item_call.on_click
+         function="Url.AddFriend" />        
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
index 35c2269b0d..87ab58e622 100644
--- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  name="Url Popup">
     <menu_item_call
-     label="Show Object Information"
+     label="Object Profile..."
      layout="topleft"
      name="show_object">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index caa36e7302..544f06ac0c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -130,19 +130,22 @@
        label="Status"
        name="Status"
        tear_off="true">
-        <menu_item_call
-         label="Away"
-         name="Set Away">
-          <menu_item_call.on_click
+        <menu_item_check
+         label="Away">
+          <menu_item_check.on_check
+           function="View.Status.CheckAway" />
+          <menu_item_check.on_click
            function="World.SetAway" />
-        </menu_item_call>
-        <menu_item_call
-         label="Busy"
-         name="Set Busy">
-          <menu_item_call.on_click
-           function="World.SetBusy"/>
-        </menu_item_call>
-      </menu>
+        </menu_item_check>
+        <menu_item_check
+         label="Do Not Disturb">
+          <menu_item_check.on_check
+           function="View.Status.CheckDoNotDisturb" />
+          <menu_item_check.on_click
+           function="World.SetDoNotDisturb"/>
+        </menu_item_check>
+      
+    </menu>
 
       <menu_item_separator/>
 
@@ -180,8 +183,7 @@
         </menu_item_call>
          <menu_item_call
          label="Toolbar buttons..."
-         name="Toolbars"
-         shortcut="control|T">
+         name="Toolbars">
             <menu_item_call.on_click
              function="Floater.Toggle"
              parameter="toybox" />
@@ -218,17 +220,28 @@
      label="Communicate"
      name="Communicate"
      tear_off="true">
-        <menu_item_check
-         label="Chat..."
+       <menu_item_check
+         label="Conversations..."
+         name="Conversations"
+         shortcut="control|T">
+            <menu_item_check.on_check
+             function="Floater.IsOpen"
+             parameter="im_container" />
+            <menu_item_check.on_click
+             function="Floater.ToggleOrBringToFront"
+             parameter="im_container" />
+	</menu_item_check>
+	<menu_item_check
+         label="Nearby Chat..."
          name="Nearby Chat"
          shortcut="control|H"
          use_mac_ctrl="true">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="chat_bar" />
+             parameter="nearby_chat" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="chat_bar" />
+             function="Floater.ToggleOrBringToFront"
+             parameter="nearby_chat" />
         </menu_item_check>
         <menu_item_check
          label="Speak"
@@ -244,26 +257,47 @@
              parameter="speak" />
         </menu_item_check>
         <menu_item_check
-         label="Voice settings..."
-         name="Nearby Voice">
+         label="Conversation Log...">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="voice_controls" />
+             parameter="conversation" />
+            <menu_item_check.on_enable
+             function="Conversation.IsConversationLoggingAllowed" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="voice_controls" />
+             parameter="conversation" />
         </menu_item_check>
-        <menu_item_check
-         label="Voice morphing..."
-         name="ShowVoice"
+        <menu_item_separator/>
+        <menu
+         label="Voice morphing"
+         name="VoiceMorphing"
          visibility_control="VoiceMorphingEnabled">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="voice_effect" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="voice_effect" />
-        </menu_item_check>
+            <menu_item_check
+             label="No voice morphing"
+             name="NoVoiceMorphing">
+                <menu_item_check.on_check
+                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" />
+                <menu_item_check.on_click
+                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" />
+            </menu_item_check>
+            <menu_item_separator/>
+            <menu_item_check
+             label="Preview..."
+             name="Preview">
+                <menu_item_check.on_check
+                 function="Floater.Visible"
+                 parameter="voice_effect" />
+                <menu_item_check.on_click
+                 function="Floater.Toggle"
+                 parameter="voice_effect" />
+            </menu_item_check>
+            <menu_item_call
+             label="Subscribe..."
+             name="Subscribe">
+                <menu_item_call.on_click
+                 function="Communicate.VoiceMorphing.Subscribe" />
+            </menu_item_call>
+        </menu>
         <menu_item_check
          label="Gestures..."
          name="Gestures"
@@ -313,8 +347,18 @@
          label="Block List"
          name="Block List">
             <menu_item_call.on_click
-              function="Communicate.BlockList" />
+              function="SideTray.PanelPeopleTab"
+              parameter="blocked_panel" />
         </menu_item_call>
+      <menu_item_separator/>
+      <menu_item_check
+       label="Do Not Disturb">
+        <menu_item_check.on_check
+         function="View.Status.CheckDoNotDisturb" />
+        <menu_item_check.on_click
+         function="World.SetDoNotDisturb"/>
+      </menu_item_check>
+
     </menu>
     <menu
      create_jump_keys="true"
@@ -1251,7 +1295,58 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>-->
-
+		<menu_item_separator/>
+		
+		<menu_item_call
+             label="User’s guide"
+             name="User’s guide">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Knowledge Base"
+             name="Knowledge Base">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/tkb/communitypage"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Wiki"
+             name="Wiki">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://wiki.secondlife.com"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Community Forums"
+             name="Community Forums">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/>
+        </menu_item_call>         
+        <menu_item_call
+             label="Support portal"
+             name="Support portal">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="https://support.secondlife.com/"/>         
+        </menu_item_call>
+        <menu_item_separator/>
+        <menu_item_call
+             label="[SECOND_LIFE] News"
+             name="Second Life News">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>  
+        </menu_item_call>
+        <menu_item_call
+             label="[SECOND_LIFE] Blogs"
+             name="Second Life Blogs">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
+        </menu_item_call>
         <menu_item_separator/>
 
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8f5cbb2b0..c681e39002 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3085,6 +3085,7 @@ Would you like to trust this authority?
    icon="alertmodal.tga"
    name="GrantedModifyRights"
    persist="true"
+   log_to_im="true"   
    type="notify">
 [NAME] has given you permission to edit their objects.
   </notification>
@@ -3093,6 +3094,7 @@ Would you like to trust this authority?
    icon="alertmodal.tga"
    name="RevokedModifyRights"
    persist="true"
+   log_to_im="true"   
    type="notify">
 Your privilege to modify [NAME]&apos;s objects has been revoked
   </notification>
@@ -3726,12 +3728,15 @@ Cannot offer friendship at this time. Please try again in a moment.
 
   <notification
    icon="alert.tga"
-   name="BusyModeSet"
+   name="DoNotDisturbModeSet"
    type="alert">
-Busy mode is set.
-Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
+Do Not Disturb is on.  You will not be notified of incoming communications.
+
+- Other residents will receive your Do Not Disturb response (set in Preferences &gt; General).
+- Teleportation offers will be declined.
+- Voice calls will be rejected.
     <usetemplate
-     ignoretext="I change my status to Busy mode"
+     ignoretext="I change my status to Do Not Disturb mode"
      name="okignore"
      yestext="OK"/>
   </notification>
@@ -4277,6 +4282,8 @@ Are you sure you want to change the Estate Covenant?
   <notification
    icon="notifytip.tga"
    name="RegionEntryAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
    <tag>fail</tag>
 The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
@@ -4285,6 +4292,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
   <notification
    icon="notifytip.tga"
    name="RegionEntryAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <tag>fail</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
@@ -4356,6 +4365,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
   <notification
    icon="notifytip.tga"
    name="TeleportEntryAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <unique>
       <context>REGIONMATURITY</context>
@@ -4367,6 +4378,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
   <notification
    icon="notifytip.tga"
    name="TeleportEntryAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <unique>
       <context>REGIONMATURITY</context>
@@ -4487,6 +4500,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandClaimAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
     <tag>fail</tag>
@@ -4495,6 +4510,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandClaimAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <tag>fail</tag>
     The land you're trying to claim contains [REGIONMATURITY] content, which is accessible to adults only.
@@ -4552,6 +4569,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandBuyAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
     <tag>fail</tag>
@@ -4560,6 +4579,8 @@ You won't receive any more notifications that you're about to visit a region wit
   <notification
    icon="notifytip.tga"
    name="LandBuyAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
     <tag>fail</tag>
     The land you're trying to buy contains [REGIONMATURITY] content, which is accessible to adults only.
@@ -5003,6 +5024,20 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor
      yestext="Go to page"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmAddingChatParticipants"
+   type="alertmodal">
+    <unique/>
+When you add a person to an existing conversation, a new conversation will be created.  All participants will receive new conversation notifications.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm adding chat paticipants"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Ok"/>
+  </notification>
+ 
   <notification
    icon="alertmodal.tga"
    name="ConfirmQuit"
@@ -5172,25 +5207,25 @@ Do you want to replace it with the selected object?
 
   <notification
    icon="alert.tga"
-   label="Busy Mode Warning"
-   name="BusyModePay"
+   label="Do Not Disturb Mode Warning"
+   name="DoNotDisturbModePay"
    type="alert">
-You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
+You have turned on Do Not Disturb. You will not receive any items offered in exchange for this payment.
 
-Would you like to leave Busy Mode before completing this transaction?
+Would you like to turn off Do Not Disturb before completing this transaction?
     <tag>confirm</tag>
     <form name="form">
       <ignore name="ignore"
        save_option="true"
-       text="I am about to pay a person or object while I am in Busy mode"/>
+       text="I am about to pay a person or object while I am in Do Not Disturb mode"/>
       <button
        default="true"
-       ignore="Always leave Busy Mode"
+       ignore="Always leave Do Not Disturb Mode"
        index="0"
        name="Yes"
        text="OK"/>
       <button
-       ignore="Never leave Busy Mode"
+       ignore="Never leave Do Not Disturb Mode"
        index="1"
        name="No"
        text="Cancel"/>
@@ -5501,6 +5536,8 @@ The string [STRING_NAME] is missing from strings.xml
   <notification
    icon="notifytip.tga"
    name="IMSystemMessageTip"
+   log_to_im="true"   
+   log_to_chat="false"   
    type="notifytip">
 [MESSAGE]
   </notification>
@@ -5544,18 +5581,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
 
   <notification
    icon="notifytip.tga"
-   name="FriendOnline"
+   name="FriendOnlineOffline"
+   log_to_chat="false"
    type="notifytip">
     <tag>friendship</tag>
-&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Online
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="FriendOffline"
-   type="notifytip">
-    <tag>friendship</tag>
-&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Offline
+&lt;nolink&gt;[NAME]&lt;/nolink&gt; is [STATUS]
+    <unique combine="cancel_old">
+      <context>NAME</context>
+    </unique>
   </notification>
 
   <notification
@@ -5799,6 +5832,8 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
+   log_to_im="true"   
+   log_to_chat="false"
    type="notifytip">
 [NAME] received your inventory offer.
   </notification>
@@ -5806,6 +5841,8 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
+   log_to_im="true"   
+   log_to_chat="false"
    type="notifytip">
 [NAME] declined your inventory offer.
   </notification>
@@ -5887,6 +5924,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
   <notification
    icon="notify.tga"
    name="PaymentReceived"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>funds</tag>
@@ -5896,6 +5934,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
   <notification
    icon="notify.tga"
    name="PaymentSent"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>funds</tag>
@@ -6040,6 +6079,7 @@ The objects on the selected parcel that are NOT owned by you have been returned
   <notification
    icon="notify.tga"
    name="ServerObjectMessage"
+   log_to_im="true"   
    persist="true"
    type="notify">
 Message from [NAME]:
@@ -6438,7 +6478,9 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="UserGiveItem"
-   type="offer">
+   log_to_im ="true"
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
@@ -6493,7 +6535,10 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOffered"
-   type="offer">
+   log_to_im="true"
+   log_to_chat="false"
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has offered to teleport you to their location:
 
 “[MESSAGE]”
@@ -6514,6 +6559,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOffered_MaturityExceeded"
+   log_to_im="true"
+   log_to_chat="false"
    type="offer">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -6537,6 +6584,8 @@ This region contains [REGION_CONTENT_MATURITY] content, but your current prefere
   <notification
    icon="notify.tga"
    name="TeleportOffered_MaturityBlocked"
+   log_to_im="true"
+   log_to_chat="false"
    type="notifytip">
 [NAME_SLURL] has offered to teleport you to their location:
 
@@ -6550,7 +6599,10 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="TeleportOfferSent"
-   type="offer">
+   log_to_im="true"
+   log_to_chat="false"
+   show_toast="false"
+   type="notify">
 	Teleport offer sent to [TO_NAME]
   </notification>
 
@@ -6577,6 +6629,7 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="OfferFriendship"
+   log_to_im="true"
    type="offer">
     <tag>friendship</tag>
     <tag>confirm</tag>
@@ -6600,7 +6653,9 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="FriendshipOffered"
-   type="offer">
+   log_to_im="true"   
+   show_toast="false"   
+   type="notify">
     <tag>friendship</tag>
 	You have offered friendship to [TO_NAME]
   </notification>
@@ -6629,7 +6684,8 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="FriendshipAccepted"
-   type="offer">
+   log_to_im="true"   
+   type="notify">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; accepted your friendship offer.
   </notification>
@@ -6637,6 +6693,7 @@ However, this region contains content accessible to adults only.
   <notification
    icon="notify.tga"
    name="FriendshipDeclined"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>friendship</tag>
@@ -6646,7 +6703,9 @@ However, this region contains content accessible to adults only.
     <notification
    icon="notify.tga"
    name="FriendshipAcceptedByMe"
-   type="offer">
+   log_to_im="true"   
+   show_toast="false"
+   type="notify">
     <tag>friendship</tag>
 Friendship offer accepted.
   </notification>
@@ -6654,7 +6713,9 @@ Friendship offer accepted.
   <notification
    icon="notify.tga"
    name="FriendshipDeclinedByMe"
-   type="offer">
+   log_to_im="true"   
+   show_toast="false"   
+   type="notify">
     <tag>friendship</tag>
 Friendship offer declined.
   </notification>
@@ -6703,6 +6764,7 @@ If you stay in this region you will be logged out.
   <notification
    icon="notify.tga"
    name="LoadWebPage"
+   show_toast="false"
    type="notify">
 Load web page [URL]?
 
@@ -6805,6 +6867,7 @@ Do not allow access if you do not fully understand why it wants access to your a
   <notification
    icon="notify.tga"
    name="ScriptDialog"
+   show_toast="false"
    type="notify">
 [NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
@@ -6823,6 +6886,7 @@ Do not allow access if you do not fully understand why it wants access to your a
   <notification
    icon="notify.tga"
    name="ScriptDialogGroup"
+   show_toast="false"
    type="notify">
     <tag>group</tag>
 [GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
@@ -9642,14 +9706,6 @@ There is no suitable surface to sit on, try another spot.
 No room to sit here, try another spot.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="AutopilotCanceled"
-   type="notify">
-   <tag>fail</tag>
-Autopilot canceled
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="ClaimObjectFailedNoPermission"
@@ -9938,4 +9994,41 @@ An internal error prevented us from properly updating your viewer.  The L$ balan
 Cannot create large prims that intersect other players.  Please re-try when other players have moved.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceChatClearLog"
+   type="alertmodal">
+    This will delete the logs of previous conversations, and any backups of that file.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I delete the log of previous conversations."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceChatDeleteTranscripts"
+   type="alertmodal">
+    This will delete the transcripts for all previous conversations. The list of past conversations will not be affected. All files with the suffixes .txt and txt.backup in the folder [FOLDER] will be deleted.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I delete transcripts."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="PreferenceChatPathChanged"
+   type="alert">
+   Unable to move files. Restored previous path.
+    <usetemplate
+     ignoretext="Unable to move files. Restored previous path."
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+  
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
deleted file mode 100644
index 9369d1b5cf..0000000000
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	name="panel_activeim_row"
-	layout="topleft"
-	follows="left|right"
-	top="0"
-	left="0"
-	height="35"
-	width="318"
-  background_opaque="false"
-  background_visible="true"
-  bg_alpha_color="0.0 0.0 0.0 0.0" >
-  <chiclet_im_p2p
-		name="p2p_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_p2p"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_p2p>
-  <chiclet_im_group
-		name="group_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_grp"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_group>
-  <chiclet_im_adhoc
-		name="adhoc_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_hoc"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_adhoc>
-	<text
-	    translate="false"
-		type="string"
-		name="contact_name"
-		layout="topleft"
-		top="10"
-		left_pad="10"
-		height="14"
-		width="250"
-		length="1"
-		follows="right|left"
-		parse_urls="false"
-		use_ellipses="true"
-		font="SansSerifBold">
-    TestString PleaseIgnore
-  </text>
-  <button
-    top="10"
-    right="-5"
-    width="17"
-    height="17"
-    layout="topleft"
-    follows="right"
-    name="hide_btn"
-    mouse_opaque="true"
-    label=""
-    tab_stop="false"
-    image_unselected="Toast_CloseBtn"
-    image_selected="Toast_CloseBtn"
-  />
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
deleted file mode 100644
index d68fa6ca6c..0000000000
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="215"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="215"
-     layout="topleft"
-     left="3"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="147">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="130"
-         layout="topleft"
-         left="0"
-         min_height="0"
-         mouse_opaque="false"
-         width="147"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="130"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="147" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Call"
-             name="call_btn"
-             width="130"
-             top="0" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Leave Call"
-             name="end_call_btn"
-             top="0"/>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             top="0"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index b7c58eb6ab..aa1b929412 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -129,6 +129,7 @@
      left_pad="3"
      right="-53"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="0"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 7c67fd7f83..53d0252215 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -4,88 +4,99 @@
  follows="left|top|right|bottom"
  height="305"
  layout="topleft"
+ left="0"
  name="block_list_panel"
  help_topic="blocked_list"
  min_height="350"
  min_width="240"
- width="280">
-        <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back"
-     left="4"
-     tab_stop="false"
-     top="1"
-     width="30"/>
-    <text
-     follows="top|left|right"
-     font="SansSerifLargeBold"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="title_text"
-     text_color="White"
-     top="5"
-     width="250">
-        Block List
-     </text>
-    <scroll_list
+ width="323">
+     <panel
+      follows="left|top|right"
+      height="27"
+      label="bottom_panel"
+      layout="topleft"
+      left="0"
+      name="blocked_buttons_panel"
+      right="-1"
+      top="0">
+         <filter_editor
+          follows="left|top|right"
+          height="23"
+          layout="topleft"
+          left="6"
+          label="Filter"
+          max_length_chars="300"
+          name="blocked_filter_input"
+          text_color="Black"
+          text_pad_left="10"
+          top="4"
+          width="177" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="OptionsMenu_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="8"
+          menu_filename="menu_people_blocked_gear.xml"
+          menu_position="bottomleft"
+          name="blocked_gear_btn"
+          tool_tip="Actions on selected person or object"
+          top="3"
+          width="31" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="Conv_toolbar_sort"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          menu_filename="menu_people_blocked_view.xml"
+          menu_position="bottomleft"
+          name="view_btn"
+          tool_tip="Sort options"
+          top_delta="0"
+          width="31" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="AddItem_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          menu_filename="menu_people_blocked_plus.xml"
+          menu_position="bottomleft"
+          name="plus_btn"
+          tool_tip="Pick a Resident or an object to block"
+          top_delta="0"
+          width="31"/>
+          <button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="TrashItem_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          left_pad="2"
+          layout="topleft"
+          name="unblock_btn"
+          tool_tip="Remove Resident or object from blocked list"
+          top_delta="0"
+          width="31"/>
+     </panel>
+    <block_list
      follows="all"
-     height="190"
+     height="273"
      layout="topleft"
-     left="5"
+     left="3"
      name="blocked"
      tool_tip="List of currently blocked Residents"
-     top="30"
-     width="270">
-        <scroll_list.columns
-         name="item_name" />
-        <scroll_list.columns
-         name="item_type"
-         width="96" />
-    </scroll_list>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Block person"
-     layout="topleft"
-     left_delta="0"
-     name="Block resident..."
-     tool_tip="Pick a Resident to block"
-     top_pad="4"
-     width="210">
-        <button.commit_callback
-         function="Block.ClickPick" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Block object by name"
-     layout="topleft"
-     left_delta="0"
-     name="Block object by name..."
-     tool_tip="Pick an object to block by name"
-     top_pad="4"
-     width="210" >
-        <button.commit_callback
-         function="Block.ClickBlockByName" />
-    </button>
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="23"
-     label="Unblock"
-     layout="topleft"
-     left_delta="0"
-     name="Unblock"
-     tool_tip="Remove Resident or object from blocked list"
-     top_pad="4"
-     width="210" >
-        <button.commit_callback
-         function="Block.ClickRemove" />
-    </button>
+     top="31"
+  	 right="-1"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
new file mode 100644
index 0000000000..752321b949
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="blocked_list_item"
+ top="0"
+ width="380">
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|right|left"
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <avatar_icon
+     default_icon_name="Generic_Person"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="16"
+     image_name="Inv_Object"
+     layout="topleft"
+     left="7"
+     name="object_icon"
+     top="4"
+     visible="false"
+     width="16" />
+    <text
+     follows="left|right"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="item_name"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="180" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
index f4722b05d6..27a27473d8 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
@@ -46,7 +46,7 @@
             follows="left|right"
             top="4"
             width="310"
-            name="chat_bar"
+            name="nearby_chat"
             mouse_opaque="false"/>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index ff0146490b..fc321fdd23 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -80,54 +80,6 @@
     <layout_panel auto_resize="false"
                       width="4"
                       min_width="4"/>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="im_well_panel"
-         top="0"
-         width="37">
-      <chiclet_im_well
-             follows="right"
-             height="28"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="im_well"
-             top="0"
-             width="35">
-        <!--
-Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
-xml attribute           Description
-image_unselected        "Unlit" - there are no new messages
-image_selected          "Unlit" + "Selected" - there are no new messages and the Well is open
-image_pressed           "Lit" - there are new messages
-image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
-             -->
-        <button
-                 auto_resize="false"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Unread_IM"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread IM messages"
-                 tool_tip="Conversations"
-                 width="34">
-          <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="im_well_window" />
-        </button>
-      </chiclet_im_well>
-    </layout_panel>
     <layout_panel
          auto_resize="false"
          follows="right"
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..a054e71e34
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|top|right"
+ height="24"
+ layout="topleft"
+ name="conversation_list_item"
+ mouse_opaque="false"
+ width="120">
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left="5"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Group"
+     layout="topleft"
+     left="5"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     image_name="Nearby_chat_icon"
+     layout="topleft"
+     left="5"
+     name="nearby_chat_icon"
+     top="2"
+     visible="false"
+     width="20"/>
+    <layout_stack
+     animate="false"
+     follows="all"
+     height="24"
+     layout="topleft"
+     left="30"
+     mouse_opaque="false"
+     name="conversation_item_stack"
+     orientation="horizontal"
+     top="0"
+     width="90">
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"        
+         height="24"
+         mouse_opaque="false"
+         name="call_icon_panel"
+         visible="false"
+         width="20">
+            <icon
+             height="18"
+             follows="top|right|left"
+             image_name="Conv_toolbar_open_call"
+             layout="topleft"
+             left="0"
+             name="selected_icon"
+             top="3"
+             width="18" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         user_resize="false"    
+         height="24"
+         mouse_opaque="false"
+         name="conversation_title_panel"
+         width="70">
+		    <text
+		     follows="left|top|right"
+		     font="SansSerifSmall"
+		     height="15"
+		     layout="topleft"
+		     left="5"
+		     name="conversation_title"
+		     parse_urls="false"
+		     top="6"
+		     use_ellipses="true"
+		     value="(loading)"
+		     width="35" />
+		    <output_monitor
+		     auto_update="true"
+		     follows="top|right"
+		     draw_border="false"
+		     height="16"
+		     layout="topleft"
+		     left_pad="5"
+ 		     mouse_opaque="true"
+ 		     name="speaking_indicator"
+ 		     visible="false"
+ 		     width="20" />
+        </layout_panel>
+    </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..78d4c174d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="conversation_log_list_item"
+ top="0"
+ width="380">
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|right|left"
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     image_name="Conv_toolbar_open_call"
+     mouse_opaque="true"
+     name="voice_session_icon"
+     tool_tip="Included a voice conversation"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     image_name="Conv_log_inbox"
+     mouse_opaque="false"
+     name="unread_ims_icon"
+     tool_tip="Messages arrived while you were logged out"
+     top="2"
+     visible="false"
+     width="20" />
+    <avatar_icon
+     default_icon_name="Generic_Person"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <text
+     follows="left|right"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="conversation_name"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="180" />
+    <text
+     follows="right"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="date_time"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="110"/>
+    <button
+     name="delete_btn"
+     tool_tip="Remove this entry"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Conv_toolbar_close"
+     image_selected="Conv_toolbar_close"
+     top="5"
+     left_pad="0"
+     height="14"
+     width="14"
+     tab_stop="false"/>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
deleted file mode 100644
index ad10e53a4e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="238"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="238"
-     layout="topleft"
-     left="5"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="145">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="100"
-         layout="topleft"
-         min_height="0"
-         mouse_opaque="false"
-         width="145"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="100"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="145" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="group_info_btn_panel">
-            <button
-             follows="left|right|bottom"
-             height="23"
-             label="Group Profile"
-             name="group_info_btn"
-             use_ellipses="true"
-             top="5"
-             width="130" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="call_btn_panel">
-            <button
-             follows="all"
-             height="23"
-             label="Call Group"
-             name="call_btn"
-             use_ellipses="true" 
-             width="130" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Leave Call"
-             name="end_call_btn"
-             use_ellipses="true" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Open Voice Controls"
-             name="voice_ctrls_btn"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 12735026fa..cfe3aeb7c9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -56,6 +56,7 @@
      left_pad="3"
      right="-31"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="-2"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
deleted file mode 100644
index 8fcd6ccbaf..0000000000
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- height="300"
- name="panel_im_control_panel"
- width="150">
-    <avatar_icon
-     follows="left|top"
-     height="105"
-     left_delta="20"
-     name="avatar_icon"
-     top="-5"
-     width="114"/>
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="183"
-     layout="topleft"
-     left="5"
-     name="button_stack"
-     orientation="vertical"
-     top_pad="5"
-     width="145">
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="20"
-         layout="topleft"
-         left="2" 
-         min_height="20"
-         width="140"
-         name="view_profile_btn_panel"
-         top="0" >
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Profile"
-             name="view_profile_btn"
-             top="0"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="add_friend_btn_panel">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Add Friend"
-             name="add_friend_btn"
-             top="5"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="teleport_btn_panel">
-        <button
-             auto_resize="false"
-             follows="left|top|right"
-             height="23"
-             label="Teleport"
-             name="teleport_btn"
-             tool_tip = "Offer to teleport this person"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="share_btn_panel">
-           <button
-             auto_resize="true"
-             follows="left|top|right"
-             height="23"
-             label="Share"
-             name="share_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="pay_btn_panel">
-           <button
-             auto_resize="true"
-             follows="left|top|right"
-             height="23"
-             label="Pay"
-             name="pay_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="call_btn_panel">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Call"
-             name="call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="End Call"
-             name="end_call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             width="140" />
-        </layout_panel>
-      <layout_panel
-       mouse_opaque="false"
-       auto_resize="true"
-       follows="top|left"
-       height="0"
-       layout="topleft"
-       min_height="0"
-       width="140"
-       name="spacer"/>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 413e22e444..433a3181cd 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -2,7 +2,7 @@
 <inbox_inventory_panel
     accepts_drag_and_drop="false"
     name="inventory_inbox"
-    start_folder="Received Items"
+    start_folder.type="inbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 2a5933e3e9..67a09949ce 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -35,7 +35,9 @@
              left="0"
              mouse_opaque="true"
              name="favorites_list"
-             start_folder="Favorites"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="Favorites"
              width="307"/>
         </accordion_tab>
         <accordion_tab
@@ -51,7 +53,9 @@
              left="0"
              mouse_opaque="true"
              name="landmarks_list"
-             start_folder="Landmarks"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="Landmarks"
              width="307"/>
         </accordion_tab>
         <accordion_tab
@@ -67,7 +71,9 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
-             start_folder="My Inventory"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="My Inventory"
              width="307"/>
           </accordion_tab>
           <accordion_tab
@@ -83,7 +89,9 @@
              left="0"
              mouse_opaque="true"
              name="library_list"
-             start_folder="LIBRARY"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="LIBRARY"
              width="313"/>
         </accordion_tab>
     </accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index d683116eb8..4de56b424e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="all"
- height="300"
+ top="0"
+ bottom_delta="10"
  help_topic="nearby_chat"
  layout="topleft"
  name="nearby_chat"
- width="320">
+ width="242"
+ height="169">
   <layout_stack
    follows="all"
-   height="295"
+   height="164"
    layout="topleft"
    left="0"
    name="stack"
    top="5"
    orientation="vertical"
-   width="320">
+   width="242">
     <layout_panel
      auto_resize="false"
      height="26"
@@ -23,7 +25,7 @@
      name="translate_chat_checkbox_lp"
      top_delta="0"
      visible="true"
-     width="313">
+     width="230">
       <check_box
        top="10"
        control_name="TranslateChat"
@@ -33,15 +35,15 @@
        layout="topleft"
        left="5"
        name="translate_chat_checkbox"
-       width="300" />
+       width="230" />
     </layout_panel>
     <layout_panel
      auto_resize="true"
-     height="277"
+     height="138"
      left_delta="0"
      layout="topleft"
      name="chat_history_lp"
-     width="318">
+     width="242">
       <chat_history
        bg_readonly_color="ChatHistoryBgColor"
        bg_writeable_color="ChatHistoryBgColor"
@@ -49,7 +51,7 @@
        layout="topleft"
        left="5"
        left_widget_pad="0"
-       height="272"
+       height="138"
        name="chat_history"
        parse_highlights="true"
        parse_urls="true"
@@ -57,7 +59,7 @@
        text_color="ChatHistoryTextColor"
        text_readonly_color="ChatHistoryTextColor"
        top="0"
-       width="313" />
+       width="237" />
     </layout_panel>
   </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 6bc9c48729..19143cef89 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -5,7 +5,7 @@
  height="25"
  layout="topleft"
  left="0"
- name="chat_bar"
+ name="nearby_chat"
  top="21"
  width="308">
     <line_editor
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index a3d39e55af..c80e5b168a 100644
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_inventory_panel
+<inventory_panel
     name="inventory_outbox"
-    start_folder="Outbox"
+    start_folder.name="Outbox"
+    show_empty_message="false"
+    show_load_status="false"
+    start_folder.type="outbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
@@ -12,6 +15,18 @@
     bevel_style="none"
     show_item_link_overlays="true"
     tool_tip="Drag and drop items here to prepare them for sale on your storefront"
-    >
-    <scroll reserve_scroll_corner="false" />
-</outbox_inventory_panel>
+    scroll.reserve_scroll_corner="false">
+      <folder folder_arrow_image="Folder_Arrow"
+              folder_indentation="8"
+              item_height="20"
+              item_top_pad="4"
+              selection_image="Rounded_Square"
+              left_pad="5"
+              icon_pad="2"
+              icon_width="16"
+              text_pad="1"
+              text_pad_right="4"
+              arrow_size="12"
+              max_folder_item_overlap="2"/>
+      <item allow_open="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 98c7c49ff4..7ce2627be9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -38,12 +38,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      name="no_filtered_friends_msg">
          Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
     </string>
-    <string
-     name="people_filter_label"
-     value="Filter People" />
-    <string
-     name="groups_filter_label"
-     value="Filter Groups" />
      <!--
      *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
      They are not defined as translatable in VLT. See EXT-5931
@@ -60,21 +54,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string
 	 name="AltMiniMapToolTipMsg"
 	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
-	<filter_editor
-     follows="left|top|right"
-     height="23"
-     layout="topleft"
-     left="10"
-     label="Filter"
-     max_length_chars="300"
-     name="filter_input"
-     text_color="Black"
-     text_pad_left="10"
-     top="3"
-     width="303" />
     <tab_container
+     bottom="-10"
      follows="all"
-     height="383"
      layout="topleft"
      left="3"
      name="tabs"
@@ -82,31 +64,120 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
-     top_pad="10"
+     top="0"
      halign="center"
-     width="319">
-     	<panel
+     right="-5">
+
+<!-- ================================= NEARBY tab =========================== -->
+
+        <panel
          background_opaque="true"
          background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
          label="NEARBY"
          layout="topleft"
          left="0"
          help_topic="people_nearby_tab"
          name="nearby_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
+            <panel
+             follows="left|top|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="nearby_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter People"
+                 max_length_chars="300"
+                 name="nearby_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="178" />
+                <button
+                 commit_callback.function="People.Gear"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="7"
+                 name="gear_btn"
+                 tool_tip="Actions on selected person"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_nearby_view.xml"
+                 menu_position="bottomleft"
+                 name="nearby_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="add_friend_btn"
+                 tool_tip="Offer friendship to a resident"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriend" />
+                </button>
+                <dnd_button
+                 enabled="false"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="nearby_del_btn"
+                 tool_tip="Remove selected person as a friend"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                 </dnd_button>
+            </panel>
          <layout_stack
            clip="false"
            follows="all"
-           height="355"
+           height="410"
            layout="topleft"
+           left="0"
            mouse_opaque="false"
            orientation="vertical"
-           width="313">
+           right="-1"
+           top_pad="0">
            <layout_panel
              height="142"
              layout="topleft"
@@ -123,16 +194,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                left="3"
                mouse_opaque="false"
                name="Net Map"
-               top="4"
-               width="305"/>
+               right="-1"
+               top="4" />
            </layout_panel>
            <layout_panel
              height="213"
              layout="topleft"
              min_dim="100"
              mouse_opaque="false"
-             user_resize="true"
-             width="313">
+             right="-1"
+             user_resize="true">
              <avatar_list
                allow_select="true"
                follows="all"
@@ -143,84 +214,122 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                keep_one_selected="false"
                multi_select="true"
                name="avatar_list"
-               top="2"
-               width="306" />
+               right="-1"
+               top="2" />
            </layout_panel>
          </layout_stack>
-         <panel
-             background_visible="true"
-             follows="left|right|bottom"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-             <menu_button
-             follows="bottom|left"
-             height="25"
-             image_hover_unselected="Toolbar_Left_Over"
-             image_overlay="OptionsMenu_Off"
-             image_selected="Toolbar_Left_Selected"
-             image_unselected="Toolbar_Left_Off"
-             layout="topleft"
-             left="0"
-             name="nearby_view_sort_btn"
-             tool_tip="Options"
-             top="1"
-             width="31" />
-             <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_friend_btn"
-                 tool_tip="Add selected Resident to your friends List"
-                 width="31">
-               <commit_callback
-                  function="People.addFriend" />
-             </button>
-             <icon
-             follows="bottom|left|right"
-             height="25"
-             image_name="Toolbar_Right_Off"
-             layout="topleft"
-             left_pad="1"
-             name="dummy_icon"
-             width="243"
-             />
-            </panel>
         </panel>
+
+<!-- ================================= FRIENDS tab ========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
-         label="MY FRIENDS"
+         label="FRIENDS"
          layout="topleft"
          left="0"
          help_topic="people_friends_tab"
          name="friends_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
+            <panel
+             follows="left|top|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="friends_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter People"
+                 max_length_chars="300"
+                 name="friends_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="177" />
+                <button
+                 commit_callback.function="People.Gear"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="8"
+                 name="gear_btn"
+                 tool_tip="Actions on selected person"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_friends_view.xml"
+                 menu_position="bottomleft"
+                 name="friends_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="friends_add_btn"
+                 tool_tip="Offer friendship to a resident"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriendWizard" />
+                </button>
+                <dnd_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="friends_del_btn"
+                 tool_tip="Remove selected person as a friend"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                </dnd_button>
+            </panel>
             <accordion
        		 background_visible="true"
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
              follows="all"
-             height="356"
+             height="408"
              layout="topleft"
              left="3"
              name="friends_accordion"
-             top="0"
-             width="307">
+             right="-2"
+             top_pad="2">
                 <accordion_tab
                  layout="topleft"
                  height="172"
@@ -257,247 +366,133 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                          width="307" />
                 </accordion_tab>
             </accordion>
-            <panel
-             background_visible="true"
-             follows="left|right|bottom"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-             
-             	  <layout_stack
-				   animate="false"
-				   border_size="0"
-				   follows="left|right|bottom"
-				   height="25"
-				   layout="topleft"
-				   orientation="horizontal"
-				   top_pad="1"
-				   left="0"
-				   name="bottom_panel"
-				   width="308">
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="options_gear_btn_panel"
-				       width="32">
-				          <menu_button
-				           follows="bottom|left"
-				           tool_tip="Show additional options"
-				           height="25"
-				           image_hover_unselected="Toolbar_Left_Over"
-				           image_overlay="OptionsMenu_Off"
-				           image_selected="Toolbar_Left_Selected"
-				           image_unselected="Toolbar_Left_Off"
-				           layout="topleft"
-				           left="0"
-				           name="friends_viewsort_btn"
-				           top="0"
-				           width="31" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="add_btn_panel"
-				       width="32">
-				          <button
-				           follows="bottom|left"
-				           height="25"
-				           image_hover_unselected="Toolbar_Middle_Over"
-				           image_overlay="AddItem_Off"
-				           image_selected="Toolbar_Middle_Selected"
-				           image_unselected="Toolbar_Middle_Off"
-				           layout="topleft"
-				           left="0"
-				           name="add_btn"
-				           tool_tip="Offer friendship to a Resident"
-				           top="0"
-				           width="31" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="true"
-				       height="25"
-				       layout="topleft"
-				       name="dummy_panel"
-				       width="210">
-				          <icon
-				           follows="bottom|left|right"
-				           height="25"
-				           image_name="Toolbar_Middle_Off"
-				           layout="topleft"
-				           left="0"
-				           top="0"
-				           name="dummy_icon"
-				           width="210" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="trash_btn_panel"
-				       width="31">
-				          <dnd_button
-				           follows="bottom|left"
-				           height="25"
-				           image_hover_unselected="Toolbar_Right_Over"
-				           image_overlay="TrashItem_Off"
-				           image_selected="Toolbar_Right_Selected"
-				           image_unselected="Toolbar_Right_Off"
-				           left="0"
-				           layout="topleft"
-				           name="del_btn"
-				           tool_tip="Remove selected person from your Friends list"
-				           top="0"
-				           width="31"/>
-				      </layout_panel>
-				  </layout_stack><!--
-             
-               <button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               left="0"
-               name="friends_viewsort_btn"
-               top="1"
-               width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
-             	 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_btn"
-                 tool_tip="Offer friendship to a Resident"
-                 width="31" />
-                <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Middle_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="209"
-             />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Right_Over"
-                 image_overlay="TrashItem_Off"
-                 image_selected="Toolbar_Right_Selected"
-                 image_unselected="Toolbar_Right_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="del_btn"
-                 tool_tip="Remove selected person from your Friends list"
-                 width="31" />
-            --></panel>
             <text
              follows="all"
              height="450"
              left="13"
              name="no_friends_help_text"
-             top="10"
-             width="293"
+             right="-13"
+             top="37"
              wrap="true" />
         </panel>
+
+<!-- ================================= GROUPS tab =========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
-         label="MY GROUPS"
+         label="GROUPS"
          layout="topleft"
          left="0"
          help_topic="people_groups_tab"
          name="groups_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
     <!--
      *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
      Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
     -->
-            <group_list
-             allow_select="true" 
-             follows="all"
-             height="356"
-             layout="topleft"
-             left="3"
-             name="group_list"
-             top="0"
-             width="307" />
             <panel
-             background_visible="true"
-             follows="left|right|bottom"
+             follows="left|top|right"
              height="27"
              label="bottom_panel"
              layout="topleft"
              left="0"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-               <menu_button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               left="3"
-               name="groups_viewsort_btn"
-               top="1"
-               width="31" />
-                <button
-                 follows="bottom|left"
+             name="groups_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter Groups"
+                 max_length_chars="300"
+                 name="groups_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="177" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="8"
+                 name="groups_gear_btn"
+                 tool_tip="Actions on selected group"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_groups_view.xml"
+                 menu_position="bottomleft"
+                 name="groups_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <menu_button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
+                 left_pad="2"
+                 menu_filename="menu_group_plus.xml"
+                 menu_position="bottomleft"
                  name="plus_btn"
                  tool_tip="Join group/Create new group"
-                 width="31" />
-                <button
-                 follows="bottom|left"
+                 top_delta="0"
+                 width="31">
+                    <validate_callback
+                     function="People.Group.Plus.Validate" />
+                </menu_button>
+                <dnd_button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Activate_Checkmark"
+                 image_overlay="TrashItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
                  layout="topleft"
-                 left_pad="1"
-                 name="activate_btn"
-                 tool_tip="Activate selected group"
-                 width="31" />
-                 <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Right_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="212"
-             />
+                 name="minus_btn"
+                 tool_tip="Leave selected group"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.Group.Minus" />
+                </dnd_button>
             </panel>
+            <group_list
+             allow_select="true" 
+             follows="all"
+             height="406"
+             layout="topleft"
+             left="3"
+             name="group_list"
+             right="-2"
+             top_pad="4" />
         </panel>
+
+<!-- ================================= RECENT tab =========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
@@ -510,265 +505,133 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          left="0"
          help_topic="people_recent_tab"
          name="recent_panel"
-         top="0"
-         width="313">
-            <avatar_list
-             allow_select="true"
-             follows="all"
-             height="356"
-             layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             show_last_interaction_time="true"
-             top="0"
-             width="307" />
+         right="-1"
+         top="0">
             <panel
-             background_visible="true"
-             follows="left|right|bottom"
+             follows="left|top|right"
              height="27"
              label="bottom_panel"
              layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-               <menu_button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               name="recent_viewsort_btn"
-               top="1"
-               width="31" />
-              <button
-                 follows="bottom|left"
+             left="0"
+             name="recent_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter People"
+                 max_length_chars="300"
+                 name="recent_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="177" />
+                <button
+                 commit_callback.function="People.Gear"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="8"
+                 name="gear_btn"
+                 tool_tip="Actions on selected person"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_recent_view.xml"
+                 menu_position="bottomleft"
+                 name="recent_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
+                 left_pad="2"
                  name="add_friend_btn"
-                 tool_tip="Add selected Resident to your friends List"
+                 tool_tip="Offer friendship to a resident"
+                 top_delta="0"
                  width="31">
-                <commit_callback
-                   function="People.addFriend" />
-              </button>
-              <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Right_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="244"
-             />
+                    <commit_callback
+                     function="People.AddFriend" />
+                </button>
+                <dnd_button
+                 enabled="false"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="recent_del_btn"
+                 tool_tip="Remove selected person as a friend"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                 </dnd_button>
             </panel>
+            <avatar_list
+             allow_select="true"
+             follows="all"
+             height="351"
+             layout="topleft"
+             left="3"
+             multi_select="true"
+             name="avatar_list"
+             show_last_interaction_time="true"
+             right="-2"
+             top_pad="4" />
         </panel>
-    </tab_container>
-    <panel
-     follows="bottom|left|right"
-     height="23"
-     layout="topleft"
-     left="8"
-     top_pad="4"
-     name="button_bar"
-     width="313">
 
-<!--********************************Profile; IM; Call, Share, Teleport********************************--> 	
-     	<layout_stack
-     	follows="bottom|left|right"
-		height="23"
-		layout="topleft"
-		name="bottom_bar_ls"
-		left="0"
-		orientation="horizontal"
-		top_pad="0"
-		width="313">
+<!-- ================================= BLOCKED tab ========================== -->
 
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left="0"
-			name="view_profile_btn_lp"
-		    auto_resize="true"
-			width="68">
-				<button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Profile"
-		         layout="topleft"
-		         left="1"
-		         name="view_profile_btn"
-		         tool_tip="Show picture, groups, and other Residents information"
-		         top="0"
-		         width="67" />	
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="im_btn_lp"
-		    auto_resize="true"
-			width="41">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="IM"
-		         layout="topleft"
-		         name="im_btn"
-		         tool_tip="Open instant message session"
-		         top="0"
-		         width="40" />			
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="call_btn_lp"
-		    auto_resize="true"
-			width="52">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Call"
-		         layout="topleft"
-		         name="call_btn"
-		         tool_tip="Call this Resident"
-		         top="0"
-		         width="51" />		
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="share_btn_lp"
-		    auto_resize="true"
-			width="66">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Share"
-		         layout="topleft"
-		         name="share_btn"
-		         tool_tip="Share an inventory item"
-		         top="0"
-		         width="65" />	
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="teleport_btn_lp"
-		    auto_resize="true"
-			width="77">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Teleport"
-		         layout="topleft"
-		         name="teleport_btn"
-		         tool_tip="Offer teleport"
-		         top="0"
-		         width="76" />		
-			</layout_panel>
-		</layout_stack>
-		
-<!--********************************Group Profile; Group Chat; Group Call buttons************************-->			
-		<layout_stack
-     	follows="bottom|left|right"
-		height="23"
-		layout="topleft"
-		mouse_opaque="false"
-		name="bottom_bar_ls1"
-		left="0"
-		orientation="horizontal"
-		top="0"
-		width="313">	
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left="0"			
-			mouse_opaque="false"
-			name="group_info_btn_lp"
-		    auto_resize="true"
-			width="108">
-				<button
-		        follows="bottom|left|right"
-		        left="1"
-		        height="23"
-		        label="Group Profile"
-		        layout="topleft"
-				mouse_opaque="false"
-		        name="group_info_btn"
-		        tool_tip="Show group information"
-		        top="0"
-		        width="107" />		
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			mouse_opaque="false"
-			name="chat_btn_lp"
-		    auto_resize="true"
-			width="101">
-				<button
-		        follows="bottom|left|right"
-		        left="1"
-		        height="23"
-		        label="Group Chat"
-		        layout="topleft"
-				mouse_opaque="false"
-		        name="chat_btn"
-		        tool_tip="Open chat session"
-		        top="0"
-		        width="100" />			
-			</layout_panel>
-		
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			mouse_opaque="false"
-			name="group_call_btn_lp"
-		    auto_resize="true"
-			width="96">
-				<button
-				follows="bottom|left|right"
-				left="1"
-				height="23"
-         		label="Group Call"
-         		layout="topleft"
-				mouse_opaque="false"
-         		name="group_call_btn"
-         		tool_tip="Call this group"
-		        top="0"
-         		width="95" />			
-			</layout_panel>		
-		</layout_stack>
-    </panel>
+        <panel
+         background_opaque="true"
+         background_visible="true"
+         bg_alpha_color="DkGray"
+         bg_opaque_color="DkGray"
+         follows="all"
+         height="383"
+         label="BLOCKED"
+         layout="topleft"
+         left="0"
+         help_topic="people_blocked_tab"
+         name="blocked_panel"
+         right="-1"
+         top="0">
+          <panel
+           class="panel_block_list_sidetray"
+           height="383"
+           name="panel_block_list_sidetray"
+           filename="panel_block_list_sidetray.xml"
+           follows="all"
+           label="Blocked Residents &amp; Objects"
+           layout="topleft"
+           left="0"
+           font="SansSerifBold"
+           top="0"
+           right="-1" />
+        </panel>
+    </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 27193a984f..bd096ebb88 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,242 +1,493 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Text Chat"
- layout="topleft"
- left="102"
- name="chat"
- top="1"
- width="517">
-  <text
-   follows="left|top"
-   layout="topleft"
-   left="30"
-   height="12"
-   name="font_size"
-   width="120"
-   top="10">
-    Font size:
-  </text>
-  <radio_group
-     height="30"
-     layout="topleft"
-     left="40"
-	 control_name="ChatFontSize"
-     name="chat_font_size"
-     top_pad="0"
-     width="440">
-        <radio_item
-         height="16"
-         label="Small"
-         layout="topleft"
-         left="0"
-         name="radio"
-         value="0"
-         top="10"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Medium"
-         layout="topleft"
-         left_delta="145"
-         name="radio2"
-         value="1"
-         top_delta="0"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Large"
-         layout="topleft"
-         left_delta="170"
-         name="radio3"
-         value="2"
-         top_delta="0"
-         width="125" />
-    </radio_group>
-    
+    border="true"
+    has_border="true"
+    height="408"
+    label="Text Chat"
+    layout="topleft"
+    left="102"
+    name="chat"
+    top="1"
+    width="517">
+
+  <panel
+      border="false"
+      height="60"
+      layout="topleft"
+      top="10"
+      left="13"
+      width="517">
+
     <check_box
-     control_name="PlayTypingAnim"
-     height="16"
-     initial_value="true"
-     label="Play typing animation when chatting"
-     layout="topleft"
-     left="30"
-     name="play_typing_animation"
-     top_pad="10"
-     width="400" />
+        control_name="PlayTypingAnim"
+        height="16"
+        initial_value="true"
+        label="Play typing animation when chatting"
+        layout="topleft"
+        top="0"
+        name="play_typing_animation"
+        width="330">
+    </check_box>
+
     <check_box
-     enabled="false"
-     height="16"
-     label="Email me IMs when I'm offline"
-     layout="topleft"
-     left_delta="0"
-     name="send_im_to_email"
-     top_pad="5"
-     width="400" />
+        enabled="false"
+        height="16"
+        label="Email me IMs when I'm offline"
+        layout="topleft"
+        name="send_im_to_email"
+        top_pad="6"
+        width="330">
+    </check_box>
+
     <check_box
-     enabled="false"
-     height="16"
-     label="Enable plain text IM and chat history"
-     layout="topleft"
-     left_delta="0"
-     name="plain_text_chat_history"
-     top_pad="5"
-     width="400" />
+        control_name="VoiceCallsFriendsOnly"
+        height="16"
+        label="Only friends and groups can call or IM me"
+        layout="topleft"
+        name="voice_call_friends_only_check"
+        top_pad="6"
+        width="350">     
+    </check_box>
+
+    <text
+        layout="topleft"
+        left="345"
+        height="12"
+        name="font_size"
+        width="120"
+        top="0">
+      Font size:
+    </text>
+
+    <combo_box
+        control_name="ChatFontSize"
+        height="23"
+        layout="topleft"
+        left="341"
+        name="chat_font_size"
+        top_pad="5"
+        width="100">
+      <item
+          label="Small"
+          name="Small"
+          value="0"/>
+      <item
+          label="Medium"
+          name="Medium"
+          value="1"/>
+      <item
+          label="Large"
+          name="Large"
+          value="2"/>  
+    </combo_box>
+
     <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble Chat"
-     layout="topleft"
-     left_delta="0"
-     top_pad="5"
-     name="bubble_text_chat"
-     width="150" />     
+        control_name="UseChatBubbles"
+        height="16"
+        label="Bubble Chat"
+        layout="topleft"
+        top_pad="4"
+        name="bubble_text_chat"
+        width="330">
+    </check_box>
+      
+  </panel>
+
+  <panel
+      border="false"
+      height="165"
+      layout="topleft"
+      left="13"
+      width="517">
+
     <text
-     name="show_ims_in_label"
-     follows="left|top"
-     layout="topleft"
-     left="30"
-     height="20"
-     width="170"
-     top_pad="15">
-     Show IMs in:
+        layout="topleft"
+        height="12"
+        name="notifications"
+        left="0"
+        width="120">
+      Notifications
     </text>
     <text
-     name="requires_restart_label"
-     follows="left|top"
-     layout="topleft"
-     top_delta="0" 
-     left="170" 
-  	 height="20"
-	 width="130"
-     text_color="White_25">
-      (requires restart)
-      </text>
-    <radio_group
-     follows="left|top"
-     height="30"
-     left="40"
-     control_name="ChatWindow"
-     name="chat_window"
-     top_pad="0"
-     tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
-     width="150">
-     <radio_item
-      height="16"
-      label="Separate Windows"
-      layout="topleft"
-      left="0"
-      name="radio"
-      value="0"
-      top="0"
-      width="150" />
-     <radio_item
-      height="16"
-      label="Tabs"
+        layout="topleft"
+        height="12"
+        name="friend_ims"
+        width="145"
+        left="0"
+        top_pad="13">
+      Friend IMs:
+    </text>
+    <combo_box
+        control_name="NotificationFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="FriendIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>      
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="None"
+          name="None"
+          value="none"/>
+    </combo_box>
+    <text
+        layout="topleft"
+        height="12"
+        name="non_friend_ims"
+        width="145"
+        left="0"
+        top_pad="9">
+      Non-friend IMs:
+    </text>
+    <combo_box
+        control_name="NotificationNonFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NonFriendIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="None"
+          name="None"
+          value="none"/>
+    </combo_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="13"
+        name="conference_ims"
+        width="145"
+        top_pad="9">
+      Conference IMs:
+    </text>
+    <combo_box
+        control_name="NotificationConferenceIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="ConferenceIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="None"
+          name="None"
+          value="none"/>
+    </combo_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="13"
+        name="group_chat"
+        width="145"
+        top_pad="9">
+      Group chat:
+    </text>
+    <combo_box
+        control_name="NotificationGroupChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="GroupChatOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="None"
+          name="None"
+          value="none"/>
+    </combo_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="12"
+        name="nearby_chat"
+        width="145"
+        top_pad="9">
+      Nearby chat:
+    </text>
+    <combo_box
+        control_name="NotificationNearbyChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NearbyChatOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolBarButton"
+          value="flash"/>
+      <item
+          label="None"
+          name="None"
+          value="none"/>
+    </combo_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="13"
+        name="notifications_alert"
+        width="500"
+        top_pad="9"
+        visible="true"
+        text_color="DrYellow">
+      To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
+    </text>
+
+  </panel>
+
+  <panel
+      border="false"
+      height="50"
       layout="topleft"
-      left_delta="0"
-      name="radio2"
-      value="1"
-      top_pad="5"
-      width="150" />
-    </radio_group>
+      left="13"
+      top_pad="10"
+      width="517">
+
     <text
-     name="disable_toast_label"
-     follows="left|top"
-     layout="topleft"
-     top_pad="20" 
-     left="30" 
-     height="10"
-     width="400">
-      Enable incoming chat popups:
-      </text>
+        layout="topleft"
+        left="0"
+        name="play_sound"
+        width="100"
+        top_pad="8"
+        visible="true">
+      Play sound:
+    </text>
+    <check_box
+        control_name="PlaySoundNewConversation"
+        height="16"
+        label="New conversation"
+        layout="topleft"
+        left_pad="15"
+        top_pad="-10"
+        name="new_conversation"
+        width="150" />
     <check_box
-     control_name="EnableGroupChatPopups"
-     name="EnableGroupChatPopups"
-     label="Group Chats" 
-     layout="topleft"
-     top_pad="5" 
-     left_delta="10" 
-     height="20"
-     tool_tip="Check to see popups when a Group Chat message arrives"
-     width="400" />
+        control_name="PlaySoundIncomingVoiceCall"
+        height="16"
+        label="Incoming voice call"
+        layout="topleft"
+        top_pad="6"
+        name="incoming_voice_call"
+        width="150" />
     <check_box
-     control_name="EnableIMChatPopups"
-     name="EnableIMChatPopups"
-     label="IM Chats" 
-     layout="topleft"
-     top_pad="5"
-     height="16"
-     tool_tip="Check to see popups when an instant message arrives"
-     width="400" />
-    <spinner
-     control_name="NearbyToastLifeTime"
-     decimal_digits="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="23"
-     label="Nearby chat toasts life time:"
-     label_width="285"
-     layout="topleft"
-     left="45"
-     max_val="60"
-     min_val="1"
-     name="nearby_toasts_lifetime"
-     top_pad="10"
-     width="325" />
-    <spinner
-     control_name="NearbyToastFadingTime"
-     decimal_digits="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="3"
-     label="Nearby chat toasts fading time:"
-     label_width="285"
-     layout="topleft"
-     left_delta="0"
-     max_val="60"
-     min_val="0"
-     name="nearby_toasts_fadingtime"
-     top_pad="3"
-     width="325" />
+        control_name="PlaySoundTeleportOffer"
+        height="16"
+        label="Teleport offer"
+        layout="topleft"
+        left_pad="35"
+        top_pad="-38"
+        name="teleport_offer"
+        width="150" />
+    <check_box
+        control_name="PlaySoundInventoryOffer"
+        height="16"
+        label="Inventory offer"
+        layout="topleft"
+        top_pad="6"
+        name="inventory_offer"
+        width="150" />
+
+  </panel>
+
+  <view_border
+      bevel_style="none"
+      height="0"
+      layout="topleft"
+      left="13"
+      name="cost_text_border"
+      top_pad="5"
+      width="495"/>
+
+  <panel
+      height="50"
+      layout="topleft"
+      left="13"
+      top_pad="10"
+      width="505">
+
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top="5"
+        width="55">
+        Save:
+    </text>
+
+    <combo_box
+        enabled="false"
+        control_name="KeepConversationLogTranscripts"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        name="chat_font_size"
+        top="0"
+        width="165">
+        <item
+            label="Log and transcripts"
+            value="2"/>
+        <item
+            label="Log only"
+            value="1"/>
+        <item
+            label="No log or transcripts"
+            value="0"/>
+    </combo_box>
+
+    <button
+        enabled="false"
+        height="23"
+        label="Clear log..."
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="clear_log"
+        width="110">
+        <commit_callback
+            function="Pref.ClearLog" />
+    </button>
+  
+    <button
+        enabled="false"
+        height="23"
+        label="Delete transcripts..."
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="delete_transcripts"
+        width="147">
+        <button.commit_callback
+            function="Pref.DeleteTranscripts" />
+    </button>
+  
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top_pad="15"
+        width="55">
+        Location:
+    </text>
+  
+    <line_editor
+        control_name="InstantMessageLogPath"
+        border_style="line"
+        border_thickness="1"
+        font="SansSerif"
+        height="23"
+        layout="topleft"
+        left_pad="55"
+        max_length="4096"
+        name="log_path_string"
+        top_delta="-5"
+        width="185">
+    </line_editor>
+  
+    <button
+        enabled="false"
+        follows="left|top"
+        height="23"
+        label="Browse..."
+        label_selected="Browse"
+        layout="topleft"
+        left_pad="5"
+        name="log_path_button"
+        top_delta="0"
+        width="112">
+      <commit_callback function="Pref.LogPath" />
+    </button>
+
+  </panel>
+  
   <button
-   follows="left|top"
-   height="23"
-   label="Translation..."
-   layout="topleft"
-   left="30"
-   name="ok_btn"
-   top="-50"
-   width="170">
-   <button.commit_callback
-    function="Pref.TranslationSettings" />
+      height="23"
+      label="Translation..."
+      layout="topleft"
+      left="9"
+      name="ok_btn"
+      top="-29"
+      width="170">
+    <commit_callback
+        function="Pref.TranslationSettings" />
   </button>
   <button
-   follows="top|left"
-   height="23"
-   layout="topleft"
-   top_pad="-23"
-   left_pad="5"
-   name="autoreplace_showgui"
-   commit_callback.function="Pref.AutoReplace"
-   label="Auto-Replace..."
-   width="150">
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="autoreplace_showgui"
+      commit_callback.function="Pref.AutoReplace"
+      label="Auto-Replace..."
+      width="150">
   </button>
   <button
-   follows="top|left"
-   height="23"
-   layout="topleft"
-   top_pad="-23"
-   left_pad="5"
-   name="spellcheck_showgui"
-   commit_callback.function="Pref.SpellChecker"
-   label="Spell Checking..."
-   width="150">
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="spellcheck_showgui"
+      commit_callback.function="Pref.SpellChecker"
+      label="Spell Checking..."
+      width="150">
   </button>
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 2b22f0d6e3..9e825fe516 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -362,7 +362,7 @@
    follows="left|top"
    height="16"
    increment="0.01"
-   initial_value="0.8"
+   initial_value="1.0"
    layout="topleft"
    label_width="115"
    label="Active:"
@@ -380,7 +380,7 @@
    follows="left|top"
    height="16"
    increment="0.01"
-   initial_value="0.5"
+   initial_value="0.95"
    layout="topleft"
    label_width="115"
    label="Inactive:"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 24882988b0..ea0f7d8593 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -409,10 +409,10 @@
      name="text_box3"
      top_pad="3"
      width="240">
-       Busy mode response:
+       Do Not Disturb response:
     </text>
     <text_editor
-     control_name="BusyModeResponse"
+     control_name="DoNotDisturbModeResponse"
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
@@ -421,7 +421,7 @@
      height="29"
      layout="topleft"
      left="30"
-     name="busy_response"
+     name="do_not_disturb_response"
      width="470"
      word_wrap="true">
        log_in_to_change
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 7eb0fac2be..cd243d40a4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -147,11 +147,24 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText3"
+     name="ShadersPrefText2"
      top_delta="0"
      width="80">
         Mid
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="center"
+     height="12"
+     layout="topleft"
+     left_delta="87"
+     name="ShadersPrefText3"
+     top_delta="0"
+     width="80">
+        High
+    </text>
     <text
      type="string"
      length="1"
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 587c461bee..78743d26bb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -1,72 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Communication"
- layout="topleft"
- left="102"
- name="im"
- top="1"
- width="517">
-    <panel.string
-     name="log_in_to_change">
-        log in to change
-    </panel.string>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Clear History"
-     tool_tip="Clear login image, last location, teleport history, web, and texture cache"
-     layout="topleft"
-     left="30"
-     name="clear_cache"
-     top="10"
-     width="145">
-        <button.commit_callback
-         function="Pref.WebClearCache" />
-    </button>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="10"
-     mouse_opaque="false"
-     name="cache_size_label_l"
-     top_delta="3"
-     text_color="LtGray_50"
-     width="300">
-       (Locations, images, web, search history)
-    </text>
-    <check_box
-	 height="16"
-     enabled="false"
-     label="Show me in Search results"
-     layout="topleft"
-     left="30"
-     name="online_searchresults"
-     top_pad="20"
-     width="350" />
-    <check_box
-	 height="16"
-	 enabled="false"
-     label="Only friends and groups know I'm online"
-     layout="topleft"
-     left="30"
-     name="online_visibility"
-     top_pad="30"
-     width="350" />
-    <check_box
-     control_name="VoiceCallsFriendsOnly"
-     height="16"
-     label="Only friends and groups can call or IM me"
-     layout="topleft"
-     left="30"
-     name="voice_call_friends_only_check"
-     top_pad="10"
-     width="350" />
+    border="true"
+    follows="left|top|right|bottom"
+    height="408"
+    label="Communication"
+    layout="topleft"
+    left="102"
+    name="im"
+    top="1"
+    width="517">
+
+  <panel.string
+      name="log_in_to_change">
+    log in to change
+  </panel.string>
+
+  <button
+      follows="left|bottom"
+      height="23"
+      label="Clear History"
+      tool_tip="Clear login image, last location, teleport history, web, and texture cache"
+      layout="topleft"
+      left="30"
+      name="clear_cache"
+      top="10"
+      width="145">
+    <button.commit_callback
+        function="Pref.WebClearCache" />
+  </button>
+
+  <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="10"
+      mouse_opaque="false"
+      name="cache_size_label_l"
+      top_delta="3"
+      text_color="LtGray_50"
+      width="300">
+    (Locations, images, web, search history)
+  </text>
+
+  <check_box
+      height="16"
+      enabled="false"
+      label="Show me in Search results"
+      layout="topleft"
+      left="30"
+      name="online_searchresults"
+      top_pad="20"
+      width="350" />
+
+  <check_box
+      height="16"
+      enabled="false"
+      label="Only friends and groups know I'm online"
+      layout="topleft"
+      left="30"
+      name="online_visibility"
+      top_pad="30"
+      width="350" />
+    
     <check_box
      enabled_control="EnableVoiceChat"
      control_name="AutoDisengageMic"
@@ -87,100 +84,7 @@
      name="favorites_on_login_check"
      top_pad="10"
      width="350" />
-	<text
-      type="string"
-    length="1"
-    follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     mouse_opaque="false"
-     name="Logs:"
-     top_pad="20"
-     width="350">
-        Chat Logs:
-    </text>
-    <check_box
-	 enabled="false"
-     control_name="LogNearbyChat"
-     height="16"
-     label="Save nearby chat logs on my computer"
-     layout="topleft"
-     left="30"
-     name="log_nearby_chat"
-     top_pad="10"
-     width="350">
-    </check_box>
-    <check_box
-	 enabled="false"
-     control_name="LogInstantMessages"
-     height="16"
-     label="Save IM logs on my computer"
-     layout="topleft"
-     left="30"
-     name="log_instant_messages"
-     top_pad="10"
-     width="350">
-    </check_box>
-    <check_box
-     control_name="LogTimestamp"
-	 enabled="false"
-     height="16"
-     label="Add timestamp to each line in chat log"
-     layout="topleft"
-     left_delta="0"
-     name="show_timestamps_check_im"
-     top_pad="10"
-     width="237" />
-	<check_box
-     control_name="LogFileNamewithDate"
-     enabled="false"
-     height="16"
-     label="Add datestamp to log file name."
-     layout="topleft"
-     left_delta="5"
-     name="logfile_name_datestamp"
-     top_pad="10"
-     width="350"/>
-	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_desc"
-     top_pad="30"
-     width="128">
-        Location of logs:
-    </text>    
-    <line_editor
-     bottom="366"
-     control_name="InstantMessageLogPath"
-     follows="top|left|right"
-     halign="right"
-     height="23"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_string"
-     top_pad="5"
-     width="250"/>
-    <button
-	 enabled="false"
-     follows="right|bottom"
-     height="23"
-     label="Browse"
-     label_selected="Browse"
-     layout="topleft"
-     left_pad="5"
-     name="log_path_button"
-     top_delta="0"
-     width="145">
-        <button.commit_callback
-         function="Pref.LogPath" />
-    </button>
+
     <button
      follows="left|bottom"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..5aa743b32d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -295,7 +295,7 @@ Please try logging in again in a minute.</string>
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
-	<string name="AvatarBusy">Busy</string>
+	<string name="AvatarDoNotDisturb">Do Not Disturb</string>
 	<string name="AvatarMuted">Blocked</string>
 
 	<!-- animations -->
@@ -384,6 +384,8 @@ Please try logging in again in a minute.</string>
 	<string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string>
 
 	<!-- Chat -->
+	<string name="NearbyChatTitle">Nearby chat</string>
+  <string name="NearbyChatLabel">(Nearby chat)</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>
@@ -405,8 +407,9 @@ Please try logging in again in a minute.</string>
 	<string name="ChangePermissions">Change its permissions</string>
 	<string name="TrackYourCamera">Track your camera</string>
   <string name="ControlYourCamera">Control your camera</string>
+	<string name="NotConnected">Not Connected</string>
+	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
   <string name="TeleportYourAgent">Teleport you</string>
-  <string name="NotConnected">Not Connected</string>
 
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">General</string>
@@ -2071,12 +2074,6 @@ For AI Character: Get the closest navigable point to the point provided.
 	</string>
 
 
-  <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Not Away</string>
-	<string name="AvatarSetAway">Away</string>
-	<string name="AvatarSetNotBusy">Not Busy</string>
-	<string name="AvatarSetBusy">Busy</string>
-
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
 	<string name="skin">Skin</string>
@@ -2270,7 +2267,8 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="InvFolder Gestures">Gestures</string>
 	<string name="InvFolder Favorite">My Favorites</string>
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
-  We should localize both of them with the same value -->
+      Also, it can be written as "Favorite" or "Favorites".
+  We should localize all variants of them with the same value -->
 	<string name="InvFolder favorite">My Favorites</string>
 	<string name="InvFolder Favorites">My Favorites</string>
 	<string name="InvFolder favorites">My Favorites</string>
@@ -2284,6 +2282,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>
+	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder All">All</string>
 
 	<string name="no_attachments">No attachments worn</string>
@@ -2524,7 +2523,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="PanelContentsNewScript">New Script</string>
 
   <!-- panel preferences general -->
-  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+  <string name="DoNotDisturbModeResponseDefault">This resident has turned on &apos;Do Not Disturb&apos; and will see your message later.</string>
 
 	<!-- Mute -->
 	<string name="MuteByName">(By name)</string>
@@ -2583,9 +2582,6 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="GroupMoneyDebits">Debits</string>
 	<string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string>
 
-	<!-- viewer object -->
-	<string name="ViewerObjectContents">Contents</string>
-
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">Acquired Items</string>
 	<string name="Cancel">Cancel</string>
@@ -3381,12 +3377,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_moderator_label">(Moderator)</string>
 	<string name="Saved_message">(Saved [LONG_TIMESTAMP])</string>
 	<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
+  <string name="OnlineStatus">Online</string>
+  <string name="OfflineStatus">Offline</string>
 
 	<!-- voice calls -->
 	<string name="answered_call">Your call has been answered</string>
 	<string name="you_started_call">You started a voice call</string>
 	<string name="you_joined_call">You joined the voice call</string>
-	<string name="name_started_call">[NAME] started a voice call</string>
+  <string name="you_auto_rejected_call-im">You automatically rejected the voice call while &apos;Do Not Disturb&apos; was on.</string>
+  <string name="name_started_call">[NAME] started a voice call</string>
 
   <string name="ringing-im">
     Joining voice call...
@@ -3401,7 +3400,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Connecting...
   </string>
   <string name="conference-title">
-    Ad-hoc Conference
+    Multi-person chat
   </string>
   <string name="conference-title-incoming">
     Conference with [AGENT_NAME]
@@ -3827,6 +3826,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Avatar_Label">Avatar</string>
   <string name="Command_Build_Label">Build</string>
   <string name="Command_Chat_Label">Chat</string>
+  <string name="Command_Conversations_Label">Conversations</string>
   <string name="Command_Compass_Label">Compass</string>
   <string name="Command_Destinations_Label">Destinations</string>
   <string name="Command_Gestures_Label">Gestures</string>
@@ -3853,6 +3853,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
   <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string>
   <string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
+  <string name="Command_Conversations_Tooltip">Converse with everyone</string>
   <string name="Command_Compass_Tooltip">Compass</string>
   <string name="Command_Destinations_Tooltip">Destinations of interest</string>
   <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
@@ -3907,4 +3908,15 @@ Try enclosing path to the editor with double quotes.
   <!-- Spell check settings floater -->
   <string name="UserDictionary">[User]</string>
   
+  <!-- Conversation log messages -->
+  <string name="logging_calls_disabled_log_empty">
+    Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
+  </string>
+  <string name="logging_calls_disabled_log_not_empty">
+    No more conversations will be logged. To resume keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
+  </string>
+  <string name="logging_calls_enabled_log_empty">
+    There are no logged conversations. After you contact someone, or someone contacts you, a log entry will be shown here.
+  </string>
+  
   </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
new file mode 100644
index 0000000000..f9facb593a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<chat_editor
+  name="chat_editor"
+  show_context_menu="true"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
deleted file mode 100644
index 0e29ed0d0b..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_adhoc
- height="23"
- name="im_adhoc_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_adhoc.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25" />
-    <chiclet_im_adhoc.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"      
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_adhoc.avatar_icon
-     bottom="3"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="adhoc_icon"
-     width="21" />
-    <chiclet_im_adhoc.unread_notifications
-     halign="center"
-     height="23"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20" />
-    <chiclet_im_adhoc.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
deleted file mode 100644
index 77011139bf..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_group
- height="23"
- name="im_group_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_group.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25" />
-    <chiclet_im_group.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"      
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_group.group_icon
-     bottom="3"
-     default_icon="Generic_Group"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="group_icon"
-     width="21" />
-    <chiclet_im_group.unread_notifications
-     height="23"
-     halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20"/>
-    <chiclet_im_group.new_message_icon
-bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
deleted file mode 100644
index 8b56a8f0f6..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_p2p
- height="23"
- name="im_p2p_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_p2p.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25"/>
-    <chiclet_im_p2p.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_p2p.avatar_icon
-     bottom="3"
-     color="white"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="avatar_icon"
-     width="21" />
-    <chiclet_im_p2p.unread_notifications
-     height="23"
-     halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20"/>
-    <chiclet_im_p2p.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_p2p>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
new file mode 100644
index 0000000000..b83d9122f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_participant
+  folder_arrow_image="Folder_Arrow"
+  item_height="24" 
+  item_top_pad="0"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"
+  left_pad="0"
+  icon_pad="10"
+  icon_width="20"
+  text_pad="7"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"
+>
+<avatar_icon
+	 follows="left"
+     height="20"
+     default_icon_name="Generic_Person"
+	 layout="topleft"
+	 top="2"
+     width="20" />
+<info_button
+	 follows="right"
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     right="-28"
+     name="info_btn"
+     width="16" />
+<output_monitor
+	follows="right"
+	auto_update="true"
+	draw_border="false"
+	height="16"
+	right="-3"
+	mouse_opaque="true"
+	name="speaking_indicator"
+	visible="true"
+	width="20" />	 
+</conversation_view_participant>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
new file mode 100644
index 0000000000..b8c39eec1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_session
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="24" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index 6fa74f403d..bbd53ccb12 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -7,4 +7,10 @@
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
-  />
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 77d8024cb2..590a4730a9 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -5,7 +5,13 @@
   item_height="20" 
   item_top_pad="4"
   selection_image="Rounded_Square"
-  >
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2">
 	<new_badge 
         label="New" 
         label_offset_horiz="-1"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
index 830c27bdac..d5b10e7f51 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inbox_inventory_panel show_load_status="false" />
+<inbox_inventory_panel show_load_status="false"
+                       start_folder.type="inbox"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
deleted file mode 100644
index d19c47f54f..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_folder_view_folder
-  folder_arrow_image="Folder_Arrow"
-  folder_indentation="8"
-  item_height="20" 
-  item_top_pad="4"
-  selection_image="Rounded_Square"
-  >
-</outbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
deleted file mode 100644
index 3964569da2..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_inventory_panel show_empty_message="false" show_load_status="false" />
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 134f2d7522..2102074674 100644
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -9,6 +9,7 @@
       h_pad="0" 
       allow_scroll="false"
       text_readonly_color="LabelTextColor"
+      text_tentative_color="TextFgTentativeColor"
       bg_writeable_color="FloaterDefaultBackgroundColor" 
       use_ellipses="false"
       bg_visible="false" 
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 0aa478ace9..0ace37a5dc 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,9 +30,9 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="99999"
-                        button_flash_rate="1.0"
-                        flash_color="EmphasisColor"/>
+                        button_flash_count="4"
+                        button_flash_rate="0.5"
+                        flash_color="BeaconColor"/>
   <button_icon pad_left="10"
                pad_right="10"
                image_bottom_pad="10"
@@ -51,7 +51,7 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="99999"
-               button_flash_rate="1.0"
-               flash_color="EmphasisColor"/>
+               button_flash_count="4"
+               button_flash_rate="0.5"
+               flash_color="BeaconColor"/>
 </toolbar>
diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
index 2e94805057..02369c9a43 100644
--- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT">
+<floater name="nearby_chat" title="CHAT">
 	<panel name="bottom_panel">
 		<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 		<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
diff --git a/indra/newview/skins/default/xui/es/menu_im_well_button.xml b/indra/newview/skins/default/xui/es/menu_im_well_button.xml
deleted file mode 100644
index c8f6c217cc..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Cerrar todo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
index af2b6e920b..e6ca59f912 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
index 890411d091..7dcb9a280d 100644
--- a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT PRÈS DE MOI">
+<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
 	<panel name="bottom_panel">
 		<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl+Entrée pour crier"/>
 		<button name="show_nearby_chat" tool_tip="Afficher/masquer le journal de chat près de vous."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml b/indra/newview/skins/default/xui/fr/menu_im_well_button.xml
deleted file mode 100644
index 8ef1529e6b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Tout fermer" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
index 82cdf292ab..762dee01bb 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/>
 	<button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
index 94c85b50c8..b47e32ce90 100644
--- a/indra/newview/skins/default/xui/it/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT NEI DINTORNI">
+<floater name="nearby_chat" title="CHAT NEI DINTORNI">
 	<panel name="bottom_panel">
 		<line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per parlare, Ctrl+Invio per gridare"/>
 		<button name="show_nearby_chat" tool_tip="Mostra/Nasconde il registro della chat nei dintorni"/>
diff --git a/indra/newview/skins/default/xui/it/menu_im_well_button.xml b/indra/newview/skins/default/xui/it/menu_im_well_button.xml
deleted file mode 100644
index 9e471b771c..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Chiudi tutto" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
index 6317d3192e..1fef88870a 100644
--- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<string name="min_width">
 		192
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
index 11f223ade6..9f5df6fb85 100644
--- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="近くのチャット">
+<floater name="nearby_chat" title="近くのチャット">
 	<panel name="bottom_panel">
 		<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して話し、Ctrl + Enter キーで叫びます。"/>
 		<button name="show_nearby_chat" tool_tip="近くのチャットログを表示／非表示"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml b/indra/newview/skins/default/xui/ja/menu_im_well_button.xml
deleted file mode 100644
index 3397004bd7..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="すべて閉じる" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 5998206f27..201fb0a376 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/>
 	<button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml b/indra/newview/skins/default/xui/pl/menu_im_well_button.xml
deleted file mode 100644
index 207bc2211b..0000000000
--- a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Zamknij wszystkie" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
index 63cf96b571..4ed3ff669b 100644
--- a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<string name="min_width">
 		192
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
index 72016c6b40..2eb2c94940 100644
--- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="BATE-PAPO LOCAL">
+<floater name="nearby_chat" title="BATE-PAPO LOCAL">
 	<panel name="bottom_panel">
 		<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
 		<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
deleted file mode 100644
index 2d37cefd6f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Fechar tudo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
index 9b993488be..5628a87109 100644
--- a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
 	<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
index 79b7b033fb..f6b2fc81e1 100644
--- a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="ЛОКАЛЬНЫЙ ЧАТ">
+<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
 	<panel name="bottom_panel">
 		<line_editor label="Щелкните здесь для общения." name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
 		<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml b/indra/newview/skins/default/xui/ru/menu_im_well_button.xml
deleted file mode 100644
index 5a5bde61b9..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Закрыть все" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
index 804ba7def7..395c643b0b 100644
--- a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Щелкните здесь для общения" name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
 	<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
index 988c845982..cd999b4b7a 100644
--- a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="YAKINDAKİ SOHBET">
+<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
 	<panel name="bottom_panel">
 		<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
 		<button name="show_nearby_chat" tool_tip="Yakın sohbet günlüğünü gösterir/gizler"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml b/indra/newview/skins/default/xui/tr/menu_im_well_button.xml
deleted file mode 100644
index c3e559a723..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Tümünü Kapat" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
index fd954475ac..7d191191c4 100644
--- a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
 	<button name="show_nearby_chat" tool_tip="yakın sohbet günlüğünü gösterir/gizler"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml b/indra/newview/skins/default/xui/zh/menu_im_well_button.xml
deleted file mode 100644
index 4b9b4b2758..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="全部關閉" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
index 4361b588d8..9489113d09 100644
--- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="點按此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
 	<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
 </panel>
-- 
cgit v1.2.3


From 41ca92c67c75d86e8053ae45725d36ca3ac7e742 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 25 Mar 2013 18:27:07 -0500
Subject: NORSPEC-54 Potential fix for crashing on all sorts of random
 operations.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index abf23935ba..9f179c0df0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2700,16 +2700,6 @@
                  parameter="TextureLoadFullRes" />
             </menu_item_check>
             <menu_item_check
-             label="Texture Atlas (experimental)"
-             name="Texture Atlas">
-              <menu_item_check.on_check
-               function="CheckControl"
-               parameter="EnableTextureAtlas" />
-              <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="EnableTextureAtlas" />
-            </menu_item_check>
-              <menu_item_check
              label="Render Attached Lights"
              name="Render Attached Lights">
                 <menu_item_check.on_check
-- 
cgit v1.2.3


From da8f2ffb16d6df1ccb9f34ddf6f26d799d2ea127 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 28 Mar 2013 04:52:24 +0200
Subject: CHUI-855 FIXED Text entry bar auto expand does not resize

---
 .../skins/default/xui/en/floater_im_session.xml    | 441 +++++++++------------
 1 file changed, 179 insertions(+), 262 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d8b085063f..3b56e974d2 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -42,58 +42,52 @@
     <floater.string
      name="multiple_participants_added"
      value="[NAME] were invited to the conversation."/>
-     <floater.string
+    <floater.string
      name="tooltip_to_separate_window"
      value="Move this conversation to a separate window"/>
-     <floater.string
+    <floater.string
      name="tooltip_to_main_window"
      value="Move this conversation back to main window"/>
-  <floater.string
+    <floater.string
      name="start_call_button_tooltip"
      value="Open voice connection"/>
-  <floater.string
+    <floater.string
      name="end_call_button_tooltip"
      value="Close voice connection"/>
-   <floater.string
+    <floater.string
      name="expcol_button_not_tearoff_tooltip"
      value="Collapse this pane"/>
-   <floater.string
+    <floater.string
      name="expcol_button_tearoff_and_expanded_tooltip"
      value="Collapse participant list"/>
-   <floater.string
+    <floater.string
      name="expcol_button_tearoff_and_collapsed_tooltip"
      value="Expand participant list"/>
     <view
-        follows="all"
-        layout="topleft"
-        name="contents_view"
-        top="0"
-        left="0"
-        height="355"
-        width="394">
-   <layout_stack
-   animate="false" 
-   default_tab_group="2"
-   follows="all"
-  height="355"
-  width="394"
-  layout="topleft"
-  orientation="vertical"
-   name="main_stack"
-  tab_group="1"
-  top="0"
-  left="0">
-  
-     <layout_panel
-         follows="left|top|right"
+     follows="all"
+     layout="topleft"
+     name="contents_view"
+     top="0"
+     left="0"
+     right="-1"
+     bottom="-1">
+        <layout_stack
+         animate="false" 
+         default_tab_group="2"
+         follows="all"
+         right="-5"
+         bottom="-1"
          layout="topleft"
-         name="toolbar_panel"
+         orientation="vertical"
+         name="main_stack"
+         tab_group="1"
          top="0"
-         left="0"
-         height="35"
-         min_height="35"
-         width="394">         
-             <menu_button
+         left="5">
+            <layout_panel
+             auto_resize="false"
+             name="toolbar_panel"
+             height="35">
+                <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
                  height="25"
@@ -107,22 +101,22 @@
                  tool_tip="View/sort options"
                  top="5"
                  width="31" />
-             <menu_button
-				 menu_filename="menu_im_conversation.xml"
-				 follows="top|left"
-				 height="25"
-				 image_hover_unselected="Toolbar_Middle_Over"
-				 image_overlay="OptionsMenu_Off"
-				 image_selected="Toolbar_Middle_Selected"
-				 image_unselected="Toolbar_Middle_Off"
-				 layout="topleft"
-			 	 top="5"
-			 	 left_pad="2"
-				 name="gear_btn"
-				 visible="false"
-				 tool_tip="Actions on selected person"
-				 width="31"/>
-             <button
+                <menu_button
+                 menu_filename="menu_im_conversation.xml"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="2"
+                 name="gear_btn"
+                 visible="false"
+                 tool_tip="Actions on selected person"
+                 width="31"/>
+                <button
                  enabled="false"
                  follows="top|left"
                  height="25"
@@ -136,7 +130,7 @@
                  name="add_btn"
                  tool_tip="Add someone to this conversation"
                  width="31"/>
-             <button
+                <button
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -149,19 +143,19 @@
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
                  width="31"/>
-              <output_monitor
-                  auto_update="true"
-                  follows="top|left"
-                  draw_border="false"
-                  height="16"
-                  layout="topleft"
-                  top="10"
-                  left_pad="10"
-                  mouse_opaque="true"
-                  name="speaking_indicator"
-                  visible="false"
-                  width="20" />       
-             <button
+                <output_monitor
+                 auto_update="true"
+                 follows="top|left"
+                 draw_border="false"
+                 height="16"
+                 layout="topleft"
+                 top="10"
+                 left_pad="10"
+                 mouse_opaque="true"
+                 name="speaking_indicator"
+                 visible="false"
+                 width="20" />
+                <button
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -170,232 +164,155 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left="292"
+                 right="-70"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
-             <button
+                <button
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="Conv_toolbar_collapse"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
                  left_pad="2"
                  name="expand_collapse_btn"
                  tool_tip="Collapse/Expand this pane"
                  width="31" />
-             <button
+                <button
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="Conv_toolbar_arrow_ne"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
                  left_pad="2"
                  name="tear_off_btn"
+                 top="5"
                  width="31" />
-     </layout_panel>
-     <layout_panel
-      name="body_panel"
-      follows="all"
-      width="394" 
-      height="235" 
-      user_resize="false"
-      auto_resize="true">
-  <layout_stack
-   animate="true" 
-   default_tab_group="2"
-  follows="all"
-  height="275"
-  width="394"
-  layout="topleft"
-  orientation="horizontal"
-  name="im_panels"
-  tab_group="1"
-  top_pad="0"
-  left="0">
-    <layout_panel
-      name="speakers_list_panel"
-      follows="all"
-      expanded_min_dim="115"
-      min_dim="0"
-      width="150" 
-      height="275"
-      user_resize="true"
-      auto_resize="false">
-      </layout_panel>
-    <layout_panel
-       default_tab_group="3"
-       left="0"
-       tab_group="2"
-       follows="all"
-       top="0"
-       height="275"
-	   width="244"
-       layout="topleft"
-       user_resize="true"
-       auto_resize="true"
-       visible="true"
-       name="right_part_holder"
-       min_width="221">
-        <panel
-         name="trnsAndChat_panel"
-         follows="all"
-         layout="topleft"
-         visible="true"
-         height="240"
-         width="244">
-         <layout_stack
-          animate="true" 
-          default_tab_group="2"
-          follows="all"
-          height="240"
-          width="244"
-          layout="topleft"
-          visible="true"
-          orientation="vertical"
-          name="translate_and_chat_stack"
-          tab_group="1"
-          left_pad="0"
-          top="0"
-          left="0">
-            <layout_panel
-             auto_resize="false"
-             user_resize="false"
-             height="26"
-             layout="topleft"
-             left_delta="0"
-             name="translate_chat_checkbox_lp"
-             top_delta="0"
-             visible="true"
-             width="210">
-                <check_box
-                 top="10"
-                 control_name="TranslateChat"
-                 enabled="true"
-                 height="16"
-                 label="Translate chat"
-                 layout="topleft"
-                 left="5"
-                 name="translate_chat_checkbox"
-                 width="230" />
             </layout_panel>
             <layout_panel
-             width="210"
-             layout="topleft"
-             follows="all"
-             left_delta="0"
-             top_delta="0"
-             bottom="0"
-             visible="true"
-             user_resize="false"
-             auto_resize="true"
-             name="chat_holder">      
-               <chat_history
-                font="SansSerifSmall"
-                follows="all"
-                visible="true"
-                name="chat_history"
-                parse_highlights="true"
-                parse_urls="true"
-                layout="topleft"
-                right="-5"
-                left="5"
-                top="0"
-                bottom="1">
-               </chat_history>
+             name="body_panel"
+             height="235">
+                <layout_stack
+                 default_tab_group="2"
+                 follows="all"
+                 orientation="horizontal"
+                 name="im_panels"
+                 tab_group="1"
+                 top="0"
+                 right="-1"
+                 bottom="-1"
+                 left="0">
+                    <layout_panel
+                     name="speakers_list_panel"
+                     expanded_min_dim="115"
+                     min_dim="0"
+                     width="150" 
+                     user_resize="true"
+                     auto_resize="false" />
+                    <layout_panel
+                     default_tab_group="3"
+                     tab_group="2"
+                     name="right_part_holder"
+                     min_width="221">
+                        <layout_stack
+                         animate="true" 
+                         default_tab_group="2"
+                         follows="all"
+                         orientation="vertical"
+                         name="translate_and_chat_stack"
+                         tab_group="1"
+                         top="0"
+                         left="0"
+                         right="-1"
+                         bottom="-1">
+                            <layout_panel
+                             auto_resize="false"
+                             height="26"
+                             name="translate_chat_checkbox_lp">
+                                <check_box
+                                 top="10"
+                                 control_name="TranslateChat"
+                                 enabled="true"
+                                 height="16"
+                                 label="Translate chat"
+                                 left="5"
+                                 name="translate_chat_checkbox"
+                                 width="230" />
+                            </layout_panel>
+                            <layout_panel
+                             name="chat_holder">
+                                <chat_history
+                                 font="SansSerifSmall"
+                                 follows="all"
+                                 name="chat_history"
+                                 parse_highlights="true"
+                                 parse_urls="true"
+                                 right="-1"
+                                 left="5"
+                                 top="0"
+                                 bottom="-1" />
+                            </layout_panel>
+                        </layout_stack>
+                    </layout_panel>
+                </layout_stack>
             </layout_panel>
-           </layout_stack>
-           </panel>
-    </layout_panel>
-  </layout_stack>
-  </layout_panel>
-  <layout_panel
+            <layout_panel
              height="35"
-             layout="topleft"
-             follows="left|right|bottom"
-             left_delta="0"
-             right="0"
-             top_delta="0"
-             bottom="0"
-             visible="true"
-             user_resize="false"
              auto_resize="false"
              name="chat_layout_panel">
-   <layout_stack
-   animate="true" 
-   default_tab_group="2"
-   follows="all"
-   height="35"
-   right="0"
-   layout="topleft"
-   orientation="horizontal"
-   name="input_panels"
-   top_pad="0"
-   left="0">
-     <layout_panel
-             height="35"
-             layout="topleft"
-             follows="left|right|bottom"
-             left_delta="0"
-             top_delta="0"
-             bottom="0"
-             visible="true"
-             user_resize="false"
-             auto_resize="true"
-             name="input_editor_layout_panel">
-              <chat_editor
-             expand_lines_count="5"
-             follows="left|right|bottom"
-               font="SansSerifSmall"
-             visible="true"
-             height="20"
-             is_expandable="true"
-             label="To"
-             text_tentative_color="TextFgTentativeColor"
-             layout="topleft"
-             name="chat_editor"
-             max_length="1023"
-             spellcheck="true"
-             tab_group="3"
-             width="160"
-             top="6"
-             left="5"
-             right="-5"
-             wrap="true">
-            </chat_editor>
+                <layout_stack
+                 animate="false"
+                 default_tab_group="2"
+                 follows="all"
+                 right="-1"
+                 orientation="horizontal"
+                 name="input_panels"
+                 top="0"
+                 bottom="-1"
+                 left="0">
+                    <layout_panel
+                     name="input_editor_layout_panel">
+                        <chat_editor
+                         layout="topleft"
+                         expand_lines_count="5"
+                         follows="left|right|bottom"
+                         font="SansSerifSmall"
+                         height="20"    
+                         is_expandable="true"
+                         text_tentative_color="TextFgTentativeColor"
+                         name="chat_editor"
+                         max_length="1023"
+                         spellcheck="true"
+                         tab_group="3"
+                         bottom="-8"
+                         left="5"
+                         right="-5"
+                         wrap="true" />
+                    </layout_panel>
+                    <layout_panel
+                     auto_resize="false"
+                     name="input_button_layout_panel"
+                     width="32">
+                        <button
+                         left="1"
+                         top="4"
+                         follows="left|right|top"
+                         height="25"
+                         image_hover_unselected="Toolbar_Middle_Over"
+                         image_overlay="Conv_expand_one_line"
+                         image_selected="Toolbar_Middle_Selected"
+                         image_unselected="Toolbar_Middle_Off"
+                         name="minz_btn"
+                         tool_tip="Shows/hides message panel"
+                         width="28" />
+                    </layout_panel>
+                </layout_stack>
             </layout_panel>
-            <layout_panel             
-             height="35"
-             layout="topleft"
-             follows="left|right|bottom"
-             left_delta="0"
-             top_delta="0"
-             bottom="0"
-             width="35"
-             visible="true"
-             user_resize="false"
-             auto_resize="false"
-             name="input_button_layout_panel">
-            <button
-                 follows="left|right|bottom"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Conv_expand_one_line"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 name="minz_btn"
-                 tool_tip="Shows/hides message panel"
-                 width="28"/>
-           </layout_panel>
-  </layout_stack>
-  </layout_panel>
-  </layout_stack>
+        </layout_stack>
     </view>
 </floater>
-- 
cgit v1.2.3


From 3b51f73b7cde18b4399af8a05fda54f65e520ba7 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 28 Mar 2013 19:06:39 +0200
Subject: CHUI-799 FIXED Notification is not given to user when they select
 only friends and groups can IM me preference

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c681e39002..105bef7321 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -352,7 +352,7 @@ Save all changes to clothing/body parts?
    icon="alertmodal.tga"
    name="FriendsAndGroupsOnly"
    type="alertmodal">
-    Non-friends won't know that you've choosen to ignore their calls and instant messages.
+    Non-friends won't know that you've chosen to ignore their calls and instant messages.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/xui/da/floater_about.xml                      | 0
 indra/newview/skins/default/xui/da/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/da/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/da/floater_animation_preview.xml          | 0
 indra/newview/skins/default/xui/da/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/da/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/da/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/da/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/da/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/da/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/da/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/da/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/da/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/da/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/da/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/da/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/da/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/da/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/da/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/da/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/da/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/da/floater_event.xml                      | 0
 indra/newview/skins/default/xui/da/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/da/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/da/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/da/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/da/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/da/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/da/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/da/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/da/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/da/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/da/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/da/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/da/floater_inventory.xml                  | 0
 indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/da/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/da/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/da/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/da/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/da/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/da/floater_map.xml                        | 0
 indra/newview/skins/default/xui/da/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/da/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/da/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/da/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/da/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/da/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/da/floater_nearby_chat.xml                | 0
 indra/newview/skins/default/xui/da/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/da/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/da/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/da/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/da/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/da/floater_postcard.xml                   | 0
 indra/newview/skins/default/xui/da/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/da/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/da/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/da/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/da/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/da/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/da/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/da/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/da/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/da/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/da/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/da/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/da/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/da/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/da/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/da/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/da/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/da/floater_search.xml                     | 0
 indra/newview/skins/default/xui/da/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/da/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/da/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/da/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/da/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/da/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/da/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/da/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/da/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/da/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/da/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/da/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/da/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/da/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/da/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/da/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/da/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/da/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/da/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/da/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/da/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/da/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/da/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/da/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/da/language_settings.xml                  | 0
 indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/da/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/da/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/da/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/da/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/da/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/da/menu_bottomtray.xml                    | 0
 indra/newview/skins/default/xui/da/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/da/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/da/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/da/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/da/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/da/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/da/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/da/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/da/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/da/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/da/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/da/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/da/menu_land.xml                          | 0
 indra/newview/skins/default/xui/da/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/da/menu_login.xml                         | 0
 indra/newview/skins/default/xui/da/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/da/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/da/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/da/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/da/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/da/menu_object.xml                        | 0
 indra/newview/skins/default/xui/da/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/da/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/da/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/da/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/da/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/da/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/da/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/da/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/da/menu_place.xml                         | 0
 indra/newview/skins/default/xui/da/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/da/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/da/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/da/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/da/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/da/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/da/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/da/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/da/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/da/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/da/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/da/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/da/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/da/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/da/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/da/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/da/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/da/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/da/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/da/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/da/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/da/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/da/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/da/mime_types.xml                         | 0
 indra/newview/skins/default/xui/da/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/da/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/da/notifications.xml                      | 0
 indra/newview/skins/default/xui/da/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/da/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/da/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/da/panel_bottomtray.xml                   | 0
 indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/da/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/da/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/da/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/da/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/da/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/da/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/da/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/da/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/da/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/da/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/da/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/da/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/da/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/da/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/da/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/da/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/da/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/da/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/da/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/da/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/da/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/da/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/da/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/da/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/da/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/da/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/da/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/da/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/da/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/da/panel_login.xml                        | 0
 indra/newview/skins/default/xui/da/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/da/panel_me.xml                           | 0
 indra/newview/skins/default/xui/da/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/da/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/da/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/da/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/da/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/da/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/da/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/da/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/da/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/da/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/da/panel_people.xml                       | 0
 indra/newview/skins/default/xui/da/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/da/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/da/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/da/panel_places.xml                       | 0
 indra/newview/skins/default/xui/da/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/da/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/da/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/da/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/da/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/da/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/da/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/da/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/da/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/da/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/da/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/da/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/da/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/da/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/da/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/da/panel_region_texture.xml               | 0
 indra/newview/skins/default/xui/da/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/da/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/da/panel_side_tray.xml                    | 0
 indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/da/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/da/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/da/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/da/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/da/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/da/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/da/role_actions.xml                       | 0
 indra/newview/skins/default/xui/da/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/da/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/da/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/da/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/da/strings.xml                            | 0
 indra/newview/skins/default/xui/da/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/da/xui_version.xml                        | 0
 indra/newview/skins/default/xui/de/floater_about.xml                      | 0
 indra/newview/skins/default/xui/de/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/de/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/de/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/de/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/de/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/de/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/de/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/de/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/de/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/de/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/de/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/de/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/de/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/de/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/de/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/de/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/de/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/de/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/de/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/de/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/de/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/de/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/de/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/de/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/de/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/de/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/de/floater_event.xml                      | 0
 indra/newview/skins/default/xui/de/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/de/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/de/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/de/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/de/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/de/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/de/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/de/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/de/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/de/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/de/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/de/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/de/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/de/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/de/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/de/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/de/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/de/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/de/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/de/floater_map.xml                        | 0
 indra/newview/skins/default/xui/de/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/de/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/de/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/de/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/de/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/de/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/de/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/de/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/de/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/de/floater_notification.xml               | 0
 indra/newview/skins/default/xui/de/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/de/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/de/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/de/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/de/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/de/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/de/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/de/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/de/floater_people.xml                     | 0
 indra/newview/skins/default/xui/de/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/de/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/de/floater_places.xml                     | 0
 indra/newview/skins/default/xui/de/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/de/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/de/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/de/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/de/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/de/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/de/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/de/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/de/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/de/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/de/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/de/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/de/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/de/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/de/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/de/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/de/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/de/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/de/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/de/floater_search.xml                     | 0
 indra/newview/skins/default/xui/de/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/de/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/de/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/de/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/de/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/de/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/de/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/de/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/de/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/de/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/de/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/de/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/de/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/de/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/de/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/de/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/de/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/de/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/de/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/de/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/de/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/de/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/de/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/de/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/de/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/de/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/de/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/de/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/de/language_settings.xml                  | 0
 indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/de/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/de/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/de/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/de/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/de/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/de/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/de/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/de/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/de/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/de/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/de/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/de/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/de/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/de/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/de/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/de/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/de/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/de/menu_land.xml                          | 0
 indra/newview/skins/default/xui/de/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/de/menu_login.xml                         | 0
 indra/newview/skins/default/xui/de/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/de/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/de/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/de/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/de/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/de/menu_object.xml                        | 0
 indra/newview/skins/default/xui/de/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/de/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/de/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/de/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/de/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/de/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/de/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/de/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/de/menu_place.xml                         | 0
 indra/newview/skins/default/xui/de/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/de/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/de/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/de/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/de/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/de/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/de/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/de/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/de/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/de/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/de/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/de/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/de/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/de/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/de/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/de/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/de/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/de/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/de/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/de/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/de/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/de/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/de/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/de/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/de/mime_types.xml                         | 0
 indra/newview/skins/default/xui/de/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/de/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/de/notifications.xml                      | 0
 indra/newview/skins/default/xui/de/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/de/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/de/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/de/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/de/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/de/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/de/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/de/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/de/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/de/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/de/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/de/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/de/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/de/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/de/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/de/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/de/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/de/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/de/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/de/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/de/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/de/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/de/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/de/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/de/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/de/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/de/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/de/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/de/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/de/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/de/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/de/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/de/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/de/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/de/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/de/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/de/panel_login.xml                        | 0
 indra/newview/skins/default/xui/de/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/de/panel_me.xml                           | 0
 indra/newview/skins/default/xui/de/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/de/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/de/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/de/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/de/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/de/panel_notifications_channel.xml        | 0
 indra/newview/skins/default/xui/de/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/de/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/de/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/de/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/de/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/de/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/de/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/de/panel_people.xml                       | 0
 indra/newview/skins/default/xui/de/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/de/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/de/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/de/panel_places.xml                       | 0
 indra/newview/skins/default/xui/de/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/de/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/de/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/de/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/de/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/de/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/de/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/de/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/de/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/de/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/de/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/de/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/de/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/de/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/de/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/de/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/de/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/de/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/de/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/de/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/de/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml            | 0
 indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/de/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/de/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/de/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/de/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/de/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/de/panel_sys_well_item.xml                | 0
 indra/newview/skins/default/xui/de/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/de/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/de/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/de/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/de/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/de/role_actions.xml                       | 0
 indra/newview/skins/default/xui/de/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/de/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/de/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/de/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/de/strings.xml                            | 0
 indra/newview/skins/default/xui/de/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/de/xui_version.xml                        | 0
 indra/newview/skins/default/xui/en/accordion_drag.xml                     | 0
 indra/newview/skins/default/xui/en/accordion_parent.xml                   | 0
 indra/newview/skins/default/xui/en/alert_button.xml                       | 0
 indra/newview/skins/default/xui/en/alert_check_box.xml                    | 0
 indra/newview/skins/default/xui/en/alert_icon.xml                         | 0
 indra/newview/skins/default/xui/en/alert_line_editor.xml                  | 0
 indra/newview/skins/default/xui/en/favorites_bar_button.xml               | 0
 indra/newview/skins/default/xui/en/floater_aaa.xml                        | 0
 indra/newview/skins/default/xui/en/floater_about.xml                      | 0
 indra/newview/skins/default/xui/en/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/en/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/en/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/en/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/en/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/en/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/en/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/en/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/en/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/en/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/en/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/en/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/en/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/en/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/en/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/en/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/en/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/en/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/en/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/en/floater_conversation_log.xml           | 0
 indra/newview/skins/default/xui/en/floater_conversation_preview.xml       | 0
 indra/newview/skins/default/xui/en/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/en/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/en/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/en/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/en/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/en/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/en/floater_event.xml                      | 0
 indra/newview/skins/default/xui/en/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/en/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/en/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/en/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/en/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/en/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/en/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/en/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/en/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/en/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/en/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/en/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/en/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/en/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/en/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/en/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/en/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/en/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/en/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/en/floater_map.xml                        | 0
 indra/newview/skins/default/xui/en/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/en/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/en/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/en/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/en/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/en/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/en/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/en/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/en/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/en/floater_my_web_profile.xml             | 0
 indra/newview/skins/default/xui/en/floater_notification.xml               | 0
 indra/newview/skins/default/xui/en/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/en/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/en/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/en/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/en/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/en/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/en/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/en/floater_people.xml                     | 0
 indra/newview/skins/default/xui/en/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/en/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/en/floater_places.xml                     | 0
 indra/newview/skins/default/xui/en/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/en/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/en/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/en/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/en/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/en/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/en/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/en/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/en/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/en/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/en/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/en/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/en/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/en/floater_script.xml                     | 0
 indra/newview/skins/default/xui/en/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/en/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/en/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/en/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/en/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/en/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/en/floater_search.xml                     | 0
 indra/newview/skins/default/xui/en/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/en/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/en/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/en/floater_side_bar_tab.xml               | 0
 indra/newview/skins/default/xui/en/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/en/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/en/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/en/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/en/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/en/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/en/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/en/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/en/floater_test_button.xml                | 0
 indra/newview/skins/default/xui/en/floater_test_checkbox.xml              | 0
 indra/newview/skins/default/xui/en/floater_test_combobox.xml              | 0
 indra/newview/skins/default/xui/en/floater_test_inspectors.xml            | 0
 indra/newview/skins/default/xui/en/floater_test_layout.xml                | 0
 indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml         | 0
 indra/newview/skins/default/xui/en/floater_test_line_editor.xml           | 0
 indra/newview/skins/default/xui/en/floater_test_list_view.xml             | 0
 indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml        | 0
 indra/newview/skins/default/xui/en/floater_test_radiogroup.xml            | 0
 indra/newview/skins/default/xui/en/floater_test_slider.xml                | 0
 indra/newview/skins/default/xui/en/floater_test_spinner.xml               | 0
 indra/newview/skins/default/xui/en/floater_test_text_editor.xml           | 0
 .../newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/en/floater_test_textbox.xml               | 0
 indra/newview/skins/default/xui/en/floater_test_toolbar.xml               | 0
 indra/newview/skins/default/xui/en/floater_test_widgets.xml               | 0
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/en/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/en/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/en/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/en/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/en/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/en/floater_ui_preview.xml                 | 0
 indra/newview/skins/default/xui/en/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml          | 0
 indra/newview/skins/default/xui/en/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/en/floater_voice_volume.xml               | 0
 indra/newview/skins/default/xui/en/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/en/floater_web_profile.xml                | 0
 indra/newview/skins/default/xui/en/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/en/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/en/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/en/fonts.xml                              | 0
 indra/newview/skins/default/xui/en/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/en/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/en/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/en/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/en/inspect_toast.xml                      | 0
 indra/newview/skins/default/xui/en/inspector_info_ctrl.xml                | 0
 indra/newview/skins/default/xui/en/language_settings.xml                  | 0
 indra/newview/skins/default/xui/en/main_view.xml                          | 0
 indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/en/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/en/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/en/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/en/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/en/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/en/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/en/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/en/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/en/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/en/menu_conversation.xml                  | 0
 indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml         | 0
 indra/newview/skins/default/xui/en/menu_conversation_log_view.xml         | 0
 indra/newview/skins/default/xui/en/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/en/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/en/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/en/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/en/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/en/menu_im_conversation.xml               | 0
 indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml          | 0
 indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/en/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/en/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/en/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/en/menu_land.xml                          | 0
 indra/newview/skins/default/xui/en/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/en/menu_login.xml                         | 0
 indra/newview/skins/default/xui/en/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/en/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/en/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/en/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/en/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/en/menu_object.xml                        | 0
 indra/newview/skins/default/xui/en/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/en/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/en/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/en/menu_participant_view.xml              | 0
 indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml           | 0
 indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml           | 0
 indra/newview/skins/default/xui/en/menu_people_blocked_view.xml           | 0
 indra/newview/skins/default/xui/en/menu_people_friends_view.xml           | 0
 indra/newview/skins/default/xui/en/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/en/menu_people_groups_view.xml            | 0
 indra/newview/skins/default/xui/en/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/en/menu_people_nearby_view.xml            | 0
 indra/newview/skins/default/xui/en/menu_people_recent_view.xml            | 0
 indra/newview/skins/default/xui/en/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/en/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/en/menu_place.xml                         | 0
 indra/newview/skins/default/xui/en/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/en/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/en/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/en/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/en/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/en/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/en/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/en/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/en/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/en/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/en/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/en/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/en/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/en/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/en/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/en/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/en/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/en/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/en/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/en/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/en/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/en/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/en/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/en/mime_types.xml                         | 0
 indra/newview/skins/default/xui/en/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/en/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/en/notification_visibility.xml            | 0
 indra/newview/skins/default/xui/en/notifications.xml                      | 0
 indra/newview/skins/default/xui/en/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/en/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/en/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/en/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/en/panel_blocked_list_item.xml            | 0
 indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/en/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/en/panel_chat_item.xml                    | 0
 indra/newview/skins/default/xui/en/panel_chat_separator.xml               | 0
 indra/newview/skins/default/xui/en/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/en/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml        | 0
 indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/en/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/en/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/en/panel_conversation_list_item.xml       | 0
 indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml   | 0
 indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/en/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/en/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/en/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/en/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/en/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/en/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/en/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/en/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/en/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/en/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/en/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/en/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/en/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/en/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/en/panel_generic_tip.xml                  | 0
 indra/newview/skins/default/xui/en/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/en/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/en/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/en/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/en/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/en/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/en/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/en/panel_hint.xml                         | 0
 indra/newview/skins/default/xui/en/panel_hint_image.xml                   | 0
 indra/newview/skins/default/xui/en/panel_hud.xml                          | 0
 indra/newview/skins/default/xui/en/panel_inbox_inventory.xml              | 0
 indra/newview/skins/default/xui/en/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/en/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/en/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/en/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/en/panel_login.xml                        | 0
 indra/newview/skins/default/xui/en/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/en/panel_me.xml                           | 0
 indra/newview/skins/default/xui/en/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/en/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/en/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/en/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/en/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/en/panel_notification.xml                 | 0
 indra/newview/skins/default/xui/en/panel_notifications_channel.xml        | 0
 indra/newview/skins/default/xui/en/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/en/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/en/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/en/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/en/panel_people.xml                       | 0
 indra/newview/skins/default/xui/en/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/en/panel_pick_list_item.xml               | 0
 indra/newview/skins/default/xui/en/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/en/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/en/panel_places.xml                       | 0
 indra/newview/skins/default/xui/en/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/en/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/en/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/en/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/en/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/en/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/en/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/en/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/en/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/en/panel_progress.xml                     | 0
 indra/newview/skins/default/xui/en/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/en/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/en/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/en/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/en/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/en/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/en/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/en/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/en/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml            | 0
 indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/en/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/en/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/en/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/en/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/en/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/en/panel_sys_well_item.xml                | 0
 indra/newview/skins/default/xui/en/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/en/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/en/panel_toast.xml                        | 0
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml                 | 0
 indra/newview/skins/default/xui/en/panel_topinfo_bar.xml                  | 0
 indra/newview/skins/default/xui/en/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/en/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/en/role_actions.xml                       | 0
 indra/newview/skins/default/xui/en/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/en/strings.xml                            | 0
 indra/newview/skins/default/xui/en/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/en/widgets/accordion.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/accordion_tab.xml              | 0
 indra/newview/skins/default/xui/en/widgets/avatar_icon.xml                | 0
 indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml           | 0
 indra/newview/skins/default/xui/en/widgets/badge.xml                      | 0
 indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml        | 0
 indra/newview/skins/default/xui/en/widgets/button.xml                     | 0
 indra/newview/skins/default/xui/en/widgets/chat_editor.xml                | 0
 indra/newview/skins/default/xui/en/widgets/chat_history.xml               | 0
 indra/newview/skins/default/xui/en/widgets/check_box.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml              | 0
 indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml              | 0
 indra/newview/skins/default/xui/en/widgets/chiclet_script.xml             | 0
 indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml         | 0
 indra/newview/skins/default/xui/en/widgets/color_swatch.xml               | 0
 indra/newview/skins/default/xui/en/widgets/combo_box.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/context_menu.xml               | 0
 indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml  | 0
 .../newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/en/widgets/drop_down.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml   | 0
 indra/newview/skins/default/xui/en/widgets/expandable_text.xml            | 0
 indra/newview/skins/default/xui/en/widgets/filter_editor.xml              | 0
 indra/newview/skins/default/xui/en/widgets/flat_list_view.xml             | 0
 indra/newview/skins/default/xui/en/widgets/floater.xml                    | 0
 indra/newview/skins/default/xui/en/widgets/flyout_button.xml              | 0
 indra/newview/skins/default/xui/en/widgets/folder_view_item.xml           | 0
 indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml         | 0
 indra/newview/skins/default/xui/en/widgets/group_icon.xml                 | 0
 indra/newview/skins/default/xui/en/widgets/hint_popup.xml                 | 0
 indra/newview/skins/default/xui/en/widgets/icon.xml                       | 0
 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml   | 0
 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml     | 0
 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml      | 0
 indra/newview/skins/default/xui/en/widgets/inspector.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml        | 0
 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml            | 0
 indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml            | 0
 indra/newview/skins/default/xui/en/widgets/layout_stack.xml               | 0
 indra/newview/skins/default/xui/en/widgets/line_editor.xml                | 0
 indra/newview/skins/default/xui/en/widgets/list_view.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/loading_indicator.xml          | 0
 indra/newview/skins/default/xui/en/widgets/location_input.xml             | 0
 indra/newview/skins/default/xui/en/widgets/menu.xml                       | 0
 indra/newview/skins/default/xui/en/widgets/menu_bar.xml                   | 0
 indra/newview/skins/default/xui/en/widgets/menu_item.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/menu_item_call.xml             | 0
 indra/newview/skins/default/xui/en/widgets/menu_item_check.xml            | 0
 indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml        | 0
 indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml         | 0
 indra/newview/skins/default/xui/en/widgets/multi_slider.xml               | 0
 indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml           | 0
 indra/newview/skins/default/xui/en/widgets/name_editor.xml                | 0
 indra/newview/skins/default/xui/en/widgets/name_list.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/output_monitor.xml             | 0
 indra/newview/skins/default/xui/en/widgets/panel.xml                      | 0
 indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml          | 0
 indra/newview/skins/default/xui/en/widgets/progress_bar.xml               | 0
 indra/newview/skins/default/xui/en/widgets/radio_group.xml                | 0
 indra/newview/skins/default/xui/en/widgets/radio_item.xml                 | 0
 indra/newview/skins/default/xui/en/widgets/scroll_bar.xml                 | 0
 indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml       | 0
 indra/newview/skins/default/xui/en/widgets/scroll_container.xml           | 0
 indra/newview/skins/default/xui/en/widgets/scroll_list.xml                | 0
 indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml       | 0
 indra/newview/skins/default/xui/en/widgets/search_combo_box.xml           | 0
 indra/newview/skins/default/xui/en/widgets/search_editor.xml              | 0
 indra/newview/skins/default/xui/en/widgets/side_tray.xml                  | 0
 indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml               | 0
 indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml         | 0
 indra/newview/skins/default/xui/en/widgets/slider.xml                     | 0
 indra/newview/skins/default/xui/en/widgets/slider_bar.xml                 | 0
 indra/newview/skins/default/xui/en/widgets/spinner.xml                    | 0
 indra/newview/skins/default/xui/en/widgets/split_button.xml               | 0
 indra/newview/skins/default/xui/en/widgets/tab_container.xml              | 0
 indra/newview/skins/default/xui/en/widgets/talk_button.xml                | 0
 indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml | 0
 indra/newview/skins/default/xui/en/widgets/text.xml                       | 0
 indra/newview/skins/default/xui/en/widgets/text_editor.xml                | 0
 indra/newview/skins/default/xui/en/widgets/textbase.xml                   | 0
 indra/newview/skins/default/xui/en/widgets/texture_picker.xml             | 0
 indra/newview/skins/default/xui/en/widgets/time.xml                       | 0
 indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml            | 0
 indra/newview/skins/default/xui/en/widgets/tool_tip.xml                   | 0
 indra/newview/skins/default/xui/en/widgets/toolbar.xml                    | 0
 indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml                    | 0
 indra/newview/skins/default/xui/en/widgets/view_border.xml                | 0
 indra/newview/skins/default/xui/en/widgets/web_browser.xml                | 0
 indra/newview/skins/default/xui/en/widgets/window_shade.xml               | 0
 indra/newview/skins/default/xui/en/xui_version.xml                        | 0
 indra/newview/skins/default/xui/es/floater_about.xml                      | 0
 indra/newview/skins/default/xui/es/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/es/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/es/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/es/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/es/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/es/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/es/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/es/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/es/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/es/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/es/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/es/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/es/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/es/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/es/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/es/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/es/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/es/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/es/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/es/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/es/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/es/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/es/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/es/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/es/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/es/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/es/floater_event.xml                      | 0
 indra/newview/skins/default/xui/es/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/es/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/es/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/es/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/es/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/es/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/es/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/es/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/es/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/es/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/es/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/es/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/es/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/es/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/es/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/es/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/es/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/es/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/es/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/es/floater_map.xml                        | 0
 indra/newview/skins/default/xui/es/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/es/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/es/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/es/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/es/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/es/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/es/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/es/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/es/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/es/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/es/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/es/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/es/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/es/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/es/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/es/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/es/floater_people.xml                     | 0
 indra/newview/skins/default/xui/es/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/es/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/es/floater_places.xml                     | 0
 indra/newview/skins/default/xui/es/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/es/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/es/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/es/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/es/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/es/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/es/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/es/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/es/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/es/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/es/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/es/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/es/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/es/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/es/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/es/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/es/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/es/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/es/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/es/floater_search.xml                     | 0
 indra/newview/skins/default/xui/es/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/es/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/es/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/es/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/es/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/es/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/es/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/es/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/es/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/es/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/es/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml         | 0
 indra/newview/skins/default/xui/es/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/es/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/es/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/es/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/es/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/es/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/es/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/es/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/es/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/es/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/es/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/es/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/es/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/es/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/es/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/es/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/es/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/es/language_settings.xml                  | 0
 indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/es/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/es/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/es/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/es/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/es/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/es/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/es/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/es/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/es/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/es/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/es/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/es/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/es/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/es/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/es/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/es/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/es/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/es/menu_land.xml                          | 0
 indra/newview/skins/default/xui/es/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/es/menu_login.xml                         | 0
 indra/newview/skins/default/xui/es/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/es/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/es/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/es/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/es/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/es/menu_object.xml                        | 0
 indra/newview/skins/default/xui/es/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/es/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/es/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/es/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/es/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/es/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/es/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/es/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/es/menu_place.xml                         | 0
 indra/newview/skins/default/xui/es/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/es/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/es/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/es/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/es/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/es/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/es/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/es/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/es/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/es/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/es/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/es/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/es/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/es/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/es/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/es/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/es/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/es/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/es/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/es/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/es/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/es/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/es/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/es/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/es/mime_types.xml                         | 0
 indra/newview/skins/default/xui/es/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/es/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/es/notifications.xml                      | 0
 indra/newview/skins/default/xui/es/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/es/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/es/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/es/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/es/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/es/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/es/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/es/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/es/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/es/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/es/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/es/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/es/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/es/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/es/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/es/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/es/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/es/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/es/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/es/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/es/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/es/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/es/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/es/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/es/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/es/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/es/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/es/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/es/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/es/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/es/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/es/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/es/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/es/panel_login.xml                        | 0
 indra/newview/skins/default/xui/es/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/es/panel_me.xml                           | 0
 indra/newview/skins/default/xui/es/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/es/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/es/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/es/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/es/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/es/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/es/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/es/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/es/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/es/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/es/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/es/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/es/panel_people.xml                       | 0
 indra/newview/skins/default/xui/es/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/es/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/es/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/es/panel_places.xml                       | 0
 indra/newview/skins/default/xui/es/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/es/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/es/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/es/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/es/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/es/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/es/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/es/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/es/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/es/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/es/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/es/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/es/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/es/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/es/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/es/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/es/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/es/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/es/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/es/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/es/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/es/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/es/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/es/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/es/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/es/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/es/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/es/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/es/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/es/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/es/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/es/role_actions.xml                       | 0
 indra/newview/skins/default/xui/es/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/es/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/es/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/es/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/es/strings.xml                            | 0
 indra/newview/skins/default/xui/es/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/es/xui_version.xml                        | 0
 indra/newview/skins/default/xui/fr/floater_about.xml                      | 0
 indra/newview/skins/default/xui/fr/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/fr/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/fr/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/fr/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/fr/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/fr/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/fr/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/fr/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/fr/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/fr/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/fr/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/fr/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/fr/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/fr/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/fr/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/fr/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/fr/floater_event.xml                      | 0
 indra/newview/skins/default/xui/fr/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/fr/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/fr/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/fr/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/fr/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/fr/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/fr/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/fr/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/fr/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/fr/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/fr/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/fr/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/fr/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/fr/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/fr/floater_map.xml                        | 0
 indra/newview/skins/default/xui/fr/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/fr/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/fr/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/fr/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/fr/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/fr/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/fr/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/fr/floater_notification.xml               | 0
 indra/newview/skins/default/xui/fr/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/fr/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/fr/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/fr/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/fr/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/fr/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_people.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/fr/floater_places.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/fr/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/fr/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/fr/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/fr/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/fr/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/fr/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/fr/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/fr/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/fr/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/fr/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/fr/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/fr/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/fr/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/fr/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/fr/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/fr/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/fr/floater_search.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/fr/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/fr/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/fr/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/fr/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/fr/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/fr/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/fr/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/fr/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/fr/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/fr/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/fr/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/fr/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/fr/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/fr/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/fr/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/fr/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/fr/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/fr/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/fr/fonts.xml                              | 0
 indra/newview/skins/default/xui/fr/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/fr/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/fr/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/fr/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/fr/language_settings.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/fr/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/fr/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/fr/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/fr/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/fr/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/fr/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/fr/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/fr/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/fr/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/fr/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/fr/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/fr/menu_land.xml                          | 0
 indra/newview/skins/default/xui/fr/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/fr/menu_login.xml                         | 0
 indra/newview/skins/default/xui/fr/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/fr/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/fr/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/fr/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/fr/menu_object.xml                        | 0
 indra/newview/skins/default/xui/fr/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/fr/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/fr/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/fr/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/fr/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/fr/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/fr/menu_place.xml                         | 0
 indra/newview/skins/default/xui/fr/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/fr/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/fr/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/fr/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/fr/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/fr/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/fr/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/fr/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/fr/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/fr/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/fr/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/fr/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/fr/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/fr/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/fr/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/fr/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/fr/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/fr/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/fr/mime_types.xml                         | 0
 indra/newview/skins/default/xui/fr/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/fr/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/fr/notifications.xml                      | 0
 indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/fr/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/fr/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/fr/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/fr/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/fr/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/fr/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/fr/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/fr/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/fr/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/fr/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/fr/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/fr/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/fr/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/fr/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/fr/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/fr/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/fr/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_login.xml                        | 0
 indra/newview/skins/default/xui/fr/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/fr/panel_me.xml                           | 0
 indra/newview/skins/default/xui/fr/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/fr/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/fr/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/fr/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/fr/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_notifications_channel.xml        | 0
 indra/newview/skins/default/xui/fr/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/fr/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/fr/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/fr/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/fr/panel_people.xml                       | 0
 indra/newview/skins/default/xui/fr/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/fr/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/fr/panel_places.xml                       | 0
 indra/newview/skins/default/xui/fr/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/fr/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/fr/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/fr/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/fr/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/fr/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/fr/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/fr/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/fr/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/fr/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/fr/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/fr/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/fr/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/fr/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/fr/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/fr/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml            | 0
 indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/fr/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/fr/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/fr/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/fr/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/fr/panel_sys_well_item.xml                | 0
 indra/newview/skins/default/xui/fr/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/fr/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/fr/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/fr/role_actions.xml                       | 0
 indra/newview/skins/default/xui/fr/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/fr/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/fr/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/fr/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/fr/strings.xml                            | 0
 indra/newview/skins/default/xui/fr/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/fr/xui_version.xml                        | 0
 indra/newview/skins/default/xui/it/floater_about.xml                      | 0
 indra/newview/skins/default/xui/it/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/it/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/it/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/it/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/it/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/it/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/it/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/it/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/it/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/it/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/it/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/it/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/it/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/it/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/it/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/it/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/it/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/it/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/it/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/it/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/it/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/it/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/it/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/it/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/it/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/it/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/it/floater_event.xml                      | 0
 indra/newview/skins/default/xui/it/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/it/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/it/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/it/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/it/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/it/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/it/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/it/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/it/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/it/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/it/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/it/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/it/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/it/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/it/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/it/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/it/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/it/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/it/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/it/floater_map.xml                        | 0
 indra/newview/skins/default/xui/it/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/it/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/it/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/it/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/it/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/it/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/it/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/it/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/it/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/it/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/it/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/it/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/it/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/it/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/it/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/it/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/it/floater_people.xml                     | 0
 indra/newview/skins/default/xui/it/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/it/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/it/floater_places.xml                     | 0
 indra/newview/skins/default/xui/it/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/it/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/it/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/it/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/it/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/it/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/it/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/it/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/it/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/it/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/it/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/it/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/it/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/it/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/it/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/it/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/it/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/it/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/it/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/it/floater_search.xml                     | 0
 indra/newview/skins/default/xui/it/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/it/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/it/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/it/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/it/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/it/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/it/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/it/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/it/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/it/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/it/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/it/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/it/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/it/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/it/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/it/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/it/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/it/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/it/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/it/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/it/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/it/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/it/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/it/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/it/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/it/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/it/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/it/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/it/language_settings.xml                  | 0
 indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/it/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/it/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/it/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/it/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/it/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/it/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/it/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/it/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/it/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/it/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/it/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/it/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/it/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/it/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/it/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/it/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/it/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/it/menu_land.xml                          | 0
 indra/newview/skins/default/xui/it/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/it/menu_login.xml                         | 0
 indra/newview/skins/default/xui/it/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/it/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/it/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/it/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/it/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/it/menu_object.xml                        | 0
 indra/newview/skins/default/xui/it/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/it/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/it/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/it/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/it/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/it/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/it/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/it/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/it/menu_place.xml                         | 0
 indra/newview/skins/default/xui/it/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/it/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/it/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/it/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/it/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/it/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/it/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/it/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/it/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/it/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/it/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/it/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/it/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/it/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/it/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/it/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/it/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/it/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/it/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/it/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/it/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/it/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/it/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/it/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/it/mime_types.xml                         | 0
 indra/newview/skins/default/xui/it/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/it/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/it/notifications.xml                      | 0
 indra/newview/skins/default/xui/it/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/it/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/it/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/it/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/it/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/it/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/it/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/it/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/it/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/it/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/it/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/it/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/it/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/it/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/it/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/it/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/it/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/it/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/it/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/it/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/it/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/it/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/it/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/it/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/it/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/it/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/it/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/it/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/it/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/it/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/it/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/it/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/it/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/it/panel_login.xml                        | 0
 indra/newview/skins/default/xui/it/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/it/panel_me.xml                           | 0
 indra/newview/skins/default/xui/it/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/it/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/it/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/it/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/it/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/it/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/it/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/it/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/it/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/it/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/it/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/it/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/it/panel_people.xml                       | 0
 indra/newview/skins/default/xui/it/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/it/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/it/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/it/panel_places.xml                       | 0
 indra/newview/skins/default/xui/it/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/it/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/it/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/it/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/it/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/it/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/it/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/it/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/it/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/it/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/it/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/it/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/it/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/it/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/it/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/it/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/it/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/it/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/it/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/it/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/it/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/it/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/it/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/it/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/it/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/it/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/it/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/it/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/it/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/it/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/it/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/it/role_actions.xml                       | 0
 indra/newview/skins/default/xui/it/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/it/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/it/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/it/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/it/strings.xml                            | 0
 indra/newview/skins/default/xui/it/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_about.xml                      | 0
 indra/newview/skins/default/xui/ja/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/ja/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/ja/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/ja/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/ja/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/ja/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/ja/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/ja/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/ja/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/ja/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/ja/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/ja/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/ja/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/ja/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/ja/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/ja/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/ja/floater_event.xml                      | 0
 indra/newview/skins/default/xui/ja/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/ja/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/ja/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/ja/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/ja/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/ja/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/ja/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/ja/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/ja/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/ja/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/ja/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/ja/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/ja/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/ja/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/ja/floater_map.xml                        | 0
 indra/newview/skins/default/xui/ja/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/ja/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/ja/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/ja/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/ja/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/ja/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/ja/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/ja/floater_notification.xml               | 0
 indra/newview/skins/default/xui/ja/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/ja/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/ja/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/ja/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/ja/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/ja/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_people.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/ja/floater_places.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/ja/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/ja/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/ja/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/ja/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/ja/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/ja/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/ja/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/ja/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/ja/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/ja/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/ja/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/ja/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/ja/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/ja/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/ja/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/ja/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/ja/floater_search.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/ja/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/ja/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/ja/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/ja/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/ja/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/ja/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/ja/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/ja/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/ja/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/ja/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/ja/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/ja/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/ja/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/ja/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/ja/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/ja/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/ja/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/ja/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/ja/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/ja/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/ja/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/ja/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/ja/language_settings.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/ja/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/ja/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/ja/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/ja/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/ja/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/ja/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/ja/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/ja/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/ja/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/ja/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/ja/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/ja/menu_land.xml                          | 0
 indra/newview/skins/default/xui/ja/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/ja/menu_login.xml                         | 0
 indra/newview/skins/default/xui/ja/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/ja/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/ja/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/ja/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/ja/menu_object.xml                        | 0
 indra/newview/skins/default/xui/ja/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/ja/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/ja/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/ja/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/ja/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/ja/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/ja/menu_place.xml                         | 0
 indra/newview/skins/default/xui/ja/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/ja/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/ja/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/ja/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/ja/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/ja/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/ja/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/ja/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/ja/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/ja/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/ja/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/ja/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/ja/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/ja/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/ja/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/ja/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/ja/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/ja/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/ja/mime_types.xml                         | 0
 indra/newview/skins/default/xui/ja/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/ja/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/ja/notifications.xml                      | 0
 indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/ja/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/ja/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/ja/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/ja/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/ja/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/ja/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/ja/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/ja/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/ja/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/ja/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/ja/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/ja/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/ja/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/ja/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/ja/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/ja/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/ja/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_login.xml                        | 0
 indra/newview/skins/default/xui/ja/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/ja/panel_me.xml                           | 0
 indra/newview/skins/default/xui/ja/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/ja/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/ja/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/ja/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/ja/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_notifications_channel.xml        | 0
 indra/newview/skins/default/xui/ja/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/ja/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/ja/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/ja/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/ja/panel_people.xml                       | 0
 indra/newview/skins/default/xui/ja/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/ja/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/ja/panel_places.xml                       | 0
 indra/newview/skins/default/xui/ja/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/ja/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/ja/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/ja/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/ja/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/ja/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/ja/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/ja/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/ja/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/ja/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/ja/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/ja/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/ja/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/ja/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/ja/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/ja/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml            | 0
 indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/ja/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/ja/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/ja/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/ja/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/ja/panel_sys_well_item.xml                | 0
 indra/newview/skins/default/xui/ja/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/ja/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/ja/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/ja/role_actions.xml                       | 0
 indra/newview/skins/default/xui/ja/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/ja/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/ja/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/ja/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/ja/strings.xml                            | 0
 indra/newview/skins/default/xui/ja/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/ja/xui_version.xml                        | 0
 indra/newview/skins/default/xui/pl/floater_about.xml                      | 0
 indra/newview/skins/default/xui/pl/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_animation_preview.xml          | 0
 indra/newview/skins/default/xui/pl/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/pl/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/pl/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/pl/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/pl/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/pl/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/pl/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/pl/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/pl/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/pl/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/pl/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/pl/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/pl/floater_event.xml                      | 0
 indra/newview/skins/default/xui/pl/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/pl/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/pl/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/pl/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/pl/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/pl/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/pl/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/pl/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/pl/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/pl/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/pl/floater_inventory.xml                  | 0
 indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/pl/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/pl/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/pl/floater_map.xml                        | 0
 indra/newview/skins/default/xui/pl/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/pl/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/pl/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/pl/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/pl/floater_nearby_chat.xml                | 0
 indra/newview/skins/default/xui/pl/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/pl/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/pl/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/pl/floater_postcard.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/pl/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/pl/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/pl/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/pl/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/pl/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/pl/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/pl/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/pl/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/pl/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/pl/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/pl/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/pl/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/pl/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/pl/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/pl/floater_search.xml                     | 0
 indra/newview/skins/default/xui/pl/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/pl/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/pl/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/pl/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/pl/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/pl/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/pl/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/pl/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/pl/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/pl/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/pl/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/pl/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/pl/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/pl/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/pl/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/pl/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/pl/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/pl/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/pl/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/pl/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/pl/language_settings.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/pl/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/pl/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/pl/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_bottomtray.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/pl/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/pl/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/pl/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/pl/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/pl/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/pl/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/pl/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/pl/menu_land.xml                          | 0
 indra/newview/skins/default/xui/pl/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/pl/menu_login.xml                         | 0
 indra/newview/skins/default/xui/pl/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/pl/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/pl/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/pl/menu_object.xml                        | 0
 indra/newview/skins/default/xui/pl/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/pl/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/pl/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/pl/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/pl/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_place.xml                         | 0
 indra/newview/skins/default/xui/pl/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/pl/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/pl/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/pl/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/pl/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/pl/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/pl/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/pl/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/pl/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/pl/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/pl/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/pl/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/pl/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/pl/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/pl/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/pl/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/pl/mime_types.xml                         | 0
 indra/newview/skins/default/xui/pl/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/pl/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/pl/notifications.xml                      | 0
 indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/pl/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/pl/panel_bottomtray.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/pl/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/pl/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/pl/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/pl/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/pl/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/pl/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/pl/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/pl/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/pl/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/pl/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/pl/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/pl/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/pl/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/pl/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/pl/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/pl/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/pl/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/pl/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_login.xml                        | 0
 indra/newview/skins/default/xui/pl/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/pl/panel_me.xml                           | 0
 indra/newview/skins/default/xui/pl/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/pl/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/pl/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/pl/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/pl/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/pl/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/pl/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/pl/panel_people.xml                       | 0
 indra/newview/skins/default/xui/pl/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/pl/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/pl/panel_places.xml                       | 0
 indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/pl/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/pl/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/pl/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/pl/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/pl/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/pl/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/pl/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/pl/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/pl/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/pl/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/pl/panel_region_texture.xml               | 0
 indra/newview/skins/default/xui/pl/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/pl/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/pl/panel_side_tray.xml                    | 0
 indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/pl/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/pl/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/pl/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/pl/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/pl/role_actions.xml                       | 0
 indra/newview/skins/default/xui/pl/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/pl/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/pl/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/pl/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/pl/strings.xml                            | 0
 indra/newview/skins/default/xui/pl/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/pl/xui_version.xml                        | 0
 indra/newview/skins/default/xui/pt/floater_about.xml                      | 0
 indra/newview/skins/default/xui/pt/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/pt/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/pt/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/pt/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/pt/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/pt/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/pt/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/pt/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/pt/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/pt/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/pt/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/pt/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/pt/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/pt/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/pt/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/pt/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/pt/floater_event.xml                      | 0
 indra/newview/skins/default/xui/pt/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/pt/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/pt/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/pt/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/pt/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/pt/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/pt/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/pt/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/pt/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/pt/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/pt/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/pt/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/pt/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/pt/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/pt/floater_map.xml                        | 0
 indra/newview/skins/default/xui/pt/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/pt/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/pt/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/pt/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/pt/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/pt/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/pt/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/pt/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/pt/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/pt/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/pt/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/pt/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_people.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/pt/floater_places.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/pt/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/pt/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/pt/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/pt/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/pt/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/pt/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/pt/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/pt/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/pt/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/pt/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/pt/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/pt/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/pt/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/pt/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/pt/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/pt/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/pt/floater_search.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/pt/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/pt/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/pt/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/pt/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/pt/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/pt/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/pt/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/pt/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/pt/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/pt/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/pt/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/pt/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/pt/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/pt/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/pt/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/pt/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/pt/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/pt/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/pt/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/pt/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/pt/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/pt/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/pt/language_settings.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/pt/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/pt/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/pt/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/pt/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/pt/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/pt/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/pt/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/pt/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/pt/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/pt/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/pt/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/pt/menu_land.xml                          | 0
 indra/newview/skins/default/xui/pt/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/pt/menu_login.xml                         | 0
 indra/newview/skins/default/xui/pt/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/pt/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/pt/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/pt/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/pt/menu_object.xml                        | 0
 indra/newview/skins/default/xui/pt/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/pt/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/pt/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/pt/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/pt/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/pt/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/pt/menu_place.xml                         | 0
 indra/newview/skins/default/xui/pt/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/pt/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/pt/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/pt/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/pt/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/pt/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/pt/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/pt/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/pt/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/pt/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/pt/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/pt/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/pt/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/pt/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/pt/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/pt/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/pt/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/pt/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/pt/mime_types.xml                         | 0
 indra/newview/skins/default/xui/pt/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/pt/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/pt/notifications.xml                      | 0
 indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml               | 0
 indra/newview/skins/default/xui/pt/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/pt/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/pt/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/pt/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/pt/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/pt/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/pt/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/pt/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/pt/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/pt/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/pt/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/pt/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/pt/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/pt/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_login.xml                        | 0
 indra/newview/skins/default/xui/pt/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/pt/panel_me.xml                           | 0
 indra/newview/skins/default/xui/pt/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/pt/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/pt/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/pt/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/pt/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/pt/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/pt/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/pt/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/pt/panel_people.xml                       | 0
 indra/newview/skins/default/xui/pt/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/pt/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/pt/panel_places.xml                       | 0
 indra/newview/skins/default/xui/pt/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/pt/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/pt/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/pt/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/pt/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/pt/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/pt/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/pt/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/pt/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/pt/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/pt/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/pt/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/pt/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/pt/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/pt/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/pt/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/pt/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/pt/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/pt/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/pt/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/pt/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/pt/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/pt/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/pt/role_actions.xml                       | 0
 indra/newview/skins/default/xui/pt/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/pt/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/pt/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/pt/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/pt/strings.xml                            | 0
 indra/newview/skins/default/xui/pt/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/pt/xui_version.xml                        | 0
 indra/newview/skins/default/xui/ru/floater_aaa.xml                        | 0
 indra/newview/skins/default/xui/ru/floater_about.xml                      | 0
 indra/newview/skins/default/xui/ru/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/ru/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/ru/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/ru/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/ru/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/ru/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/ru/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/ru/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/ru/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/ru/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/ru/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/ru/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/ru/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/ru/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/ru/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/ru/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/ru/floater_event.xml                      | 0
 indra/newview/skins/default/xui/ru/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/ru/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/ru/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/ru/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/ru/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/ru/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/ru/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/ru/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/ru/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/ru/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/ru/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/ru/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/ru/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/ru/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/ru/floater_map.xml                        | 0
 indra/newview/skins/default/xui/ru/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/ru/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/ru/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/ru/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/ru/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/ru/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/ru/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/ru/floater_notification.xml               | 0
 indra/newview/skins/default/xui/ru/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/ru/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/ru/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/ru/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/ru/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/ru/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_people.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/ru/floater_places.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/ru/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/ru/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/ru/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/ru/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/ru/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/ru/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/ru/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/ru/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/ru/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/ru/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/ru/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/ru/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/ru/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/ru/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/ru/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/ru/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/ru/floater_search.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/ru/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/ru/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/ru/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/ru/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/ru/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/ru/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/ru/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/ru/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/ru/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/ru/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/ru/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/ru/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/ru/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/ru/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/ru/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/ru/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/ru/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/ru/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/ru/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/ru/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/ru/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/ru/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/ru/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/ru/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/ru/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/ru/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/ru/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/ru/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/ru/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/ru/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/ru/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/ru/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/ru/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/ru/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/ru/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/ru/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/ru/menu_land.xml                          | 0
 indra/newview/skins/default/xui/ru/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/ru/menu_login.xml                         | 0
 indra/newview/skins/default/xui/ru/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/ru/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/ru/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/ru/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/ru/menu_object.xml                        | 0
 indra/newview/skins/default/xui/ru/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/ru/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/ru/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/ru/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/ru/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/ru/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/ru/menu_place.xml                         | 0
 indra/newview/skins/default/xui/ru/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/ru/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/ru/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/ru/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/ru/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/ru/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/ru/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/ru/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/ru/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/ru/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/ru/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/ru/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/ru/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/ru/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/ru/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/ru/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/ru/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/ru/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/ru/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/ru/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/ru/mime_types.xml                         | 0
 indra/newview/skins/default/xui/ru/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/ru/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/ru/notifications.xml                      | 0
 indra/newview/skins/default/xui/ru/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/ru/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/ru/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/ru/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/ru/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/ru/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/ru/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/ru/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/ru/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/ru/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/ru/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/ru/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/ru/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/ru/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/ru/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/ru/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/ru/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_login.xml                        | 0
 indra/newview/skins/default/xui/ru/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/ru/panel_me.xml                           | 0
 indra/newview/skins/default/xui/ru/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/ru/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/ru/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/ru/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/ru/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/ru/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/ru/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/ru/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/ru/panel_people.xml                       | 0
 indra/newview/skins/default/xui/ru/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/ru/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/ru/panel_places.xml                       | 0
 indra/newview/skins/default/xui/ru/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/ru/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/ru/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/ru/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/ru/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/ru/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/ru/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/ru/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/ru/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/ru/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/ru/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/ru/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/ru/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/ru/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/ru/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/ru/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/ru/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/ru/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/ru/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/ru/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/ru/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/ru/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/ru/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/ru/role_actions.xml                       | 0
 indra/newview/skins/default/xui/ru/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/ru/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/ru/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/ru/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/ru/strings.xml                            | 0
 indra/newview/skins/default/xui/ru/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_aaa.xml                        | 0
 indra/newview/skins/default/xui/tr/floater_about.xml                      | 0
 indra/newview/skins/default/xui/tr/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/tr/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/tr/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/tr/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/tr/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/tr/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/tr/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/tr/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/tr/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/tr/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/tr/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/tr/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/tr/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/tr/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/tr/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/tr/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/tr/floater_event.xml                      | 0
 indra/newview/skins/default/xui/tr/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/tr/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/tr/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/tr/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/tr/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/tr/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/tr/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/tr/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/tr/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/tr/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/tr/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/tr/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/tr/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/tr/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/tr/floater_map.xml                        | 0
 indra/newview/skins/default/xui/tr/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/tr/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/tr/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/tr/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/tr/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/tr/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/tr/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/tr/floater_notification.xml               | 0
 indra/newview/skins/default/xui/tr/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/tr/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/tr/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/tr/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/tr/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/tr/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_people.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/tr/floater_places.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/tr/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/tr/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/tr/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/tr/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/tr/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/tr/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/tr/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/tr/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/tr/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/tr/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/tr/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/tr/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/tr/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/tr/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/tr/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/tr/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/tr/floater_search.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/tr/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/tr/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/tr/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/tr/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/tr/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/tr/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/tr/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/tr/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/tr/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/tr/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/tr/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/tr/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/tr/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/tr/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/tr/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/tr/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/tr/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/tr/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/tr/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/tr/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/tr/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/tr/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/tr/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/tr/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/tr/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/tr/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/tr/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/tr/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/tr/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/tr/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/tr/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/tr/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/tr/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/tr/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/tr/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/tr/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/tr/menu_land.xml                          | 0
 indra/newview/skins/default/xui/tr/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/tr/menu_login.xml                         | 0
 indra/newview/skins/default/xui/tr/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/tr/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/tr/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/tr/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/tr/menu_object.xml                        | 0
 indra/newview/skins/default/xui/tr/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/tr/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/tr/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/tr/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/tr/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/tr/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/tr/menu_place.xml                         | 0
 indra/newview/skins/default/xui/tr/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/tr/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/tr/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/tr/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/tr/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/tr/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/tr/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/tr/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/tr/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/tr/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/tr/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/tr/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/tr/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/tr/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/tr/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/tr/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/tr/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/tr/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/tr/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/tr/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/tr/mime_types.xml                         | 0
 indra/newview/skins/default/xui/tr/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/tr/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/tr/notifications.xml                      | 0
 indra/newview/skins/default/xui/tr/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/tr/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/tr/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/tr/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/tr/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/tr/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/tr/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/tr/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/tr/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/tr/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/tr/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/tr/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/tr/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/tr/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/tr/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/tr/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/tr/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_login.xml                        | 0
 indra/newview/skins/default/xui/tr/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/tr/panel_me.xml                           | 0
 indra/newview/skins/default/xui/tr/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/tr/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/tr/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/tr/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/tr/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/tr/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/tr/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/tr/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/tr/panel_people.xml                       | 0
 indra/newview/skins/default/xui/tr/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/tr/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/tr/panel_places.xml                       | 0
 indra/newview/skins/default/xui/tr/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/tr/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/tr/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/tr/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/tr/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/tr/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/tr/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/tr/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/tr/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/tr/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/tr/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/tr/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/tr/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/tr/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/tr/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/tr/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/tr/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/tr/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/tr/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/tr/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/tr/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/tr/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/tr/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/tr/role_actions.xml                       | 0
 indra/newview/skins/default/xui/tr/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/tr/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/tr/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/tr/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/tr/strings.xml                            | 0
 indra/newview/skins/default/xui/tr/teleport_strings.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_aaa.xml                        | 0
 indra/newview/skins/default/xui/zh/floater_about.xml                      | 0
 indra/newview/skins/default/xui/zh/floater_about_land.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_activeim.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml     | 0
 indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml      | 0
 indra/newview/skins/default/xui/zh/floater_auction.xml                    | 0
 indra/newview/skins/default/xui/zh/floater_autoreplace.xml                | 0
 indra/newview/skins/default/xui/zh/floater_avatar.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_avatar_picker.xml              | 0
 indra/newview/skins/default/xui/zh/floater_avatar_textures.xml            | 0
 indra/newview/skins/default/xui/zh/floater_beacons.xml                    | 0
 indra/newview/skins/default/xui/zh/floater_build_options.xml              | 0
 indra/newview/skins/default/xui/zh/floater_bulk_perms.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_bumps.xml                      | 0
 indra/newview/skins/default/xui/zh/floater_buy_contents.xml               | 0
 indra/newview/skins/default/xui/zh/floater_buy_currency.xml               | 0
 indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml          | 0
 indra/newview/skins/default/xui/zh/floater_buy_land.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_buy_object.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_camera.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_chat_bar.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_choose_group.xml               | 0
 indra/newview/skins/default/xui/zh/floater_color_picker.xml               | 0
 indra/newview/skins/default/xui/zh/floater_critical.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml          | 0
 indra/newview/skins/default/xui/zh/floater_destinations.xml               | 0
 indra/newview/skins/default/xui/zh/floater_display_name.xml               | 0
 indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml             | 0
 indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml            | 0
 indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml          | 0
 indra/newview/skins/default/xui/zh/floater_environment_settings.xml       | 0
 indra/newview/skins/default/xui/zh/floater_event.xml                      | 0
 indra/newview/skins/default/xui/zh/floater_fast_timers.xml                | 0
 indra/newview/skins/default/xui/zh/floater_font_test.xml                  | 0
 indra/newview/skins/default/xui/zh/floater_gesture.xml                    | 0
 indra/newview/skins/default/xui/zh/floater_god_tools.xml                  | 0
 indra/newview/skins/default/xui/zh/floater_hardware_settings.xml          | 0
 indra/newview/skins/default/xui/zh/floater_help_browser.xml               | 0
 indra/newview/skins/default/xui/zh/floater_how_to.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_hud.xml                        | 0
 indra/newview/skins/default/xui/zh/floater_im_container.xml               | 0
 indra/newview/skins/default/xui/zh/floater_im_session.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_image_preview.xml              | 0
 indra/newview/skins/default/xui/zh/floater_import_collada.xml             | 0
 indra/newview/skins/default/xui/zh/floater_incoming_call.xml              | 0
 indra/newview/skins/default/xui/zh/floater_inspect.xml                    | 0
 indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml  | 0
 indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml      | 0
 indra/newview/skins/default/xui/zh/floater_joystick.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_lagmeter.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_land_holdings.xml              | 0
 indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml             | 0
 indra/newview/skins/default/xui/zh/floater_lsl_guide.xml                  | 0
 indra/newview/skins/default/xui/zh/floater_map.xml                        | 0
 indra/newview/skins/default/xui/zh/floater_media_browser.xml              | 0
 indra/newview/skins/default/xui/zh/floater_media_settings.xml             | 0
 indra/newview/skins/default/xui/zh/floater_mem_leaking.xml                | 0
 indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml            | 0
 indra/newview/skins/default/xui/zh/floater_model_preview.xml              | 0
 indra/newview/skins/default/xui/zh/floater_moveview.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_mute_object.xml                | 0
 indra/newview/skins/default/xui/zh/floater_my_appearance.xml              | 0
 indra/newview/skins/default/xui/zh/floater_my_inventory.xml               | 0
 indra/newview/skins/default/xui/zh/floater_notification.xml               | 0
 indra/newview/skins/default/xui/zh/floater_notifications_console.xml      | 0
 indra/newview/skins/default/xui/zh/floater_object_weights.xml             | 0
 indra/newview/skins/default/xui/zh/floater_openobject.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml             | 0
 indra/newview/skins/default/xui/zh/floater_outgoing_call.xml              | 0
 indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml     | 0
 indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml        | 0
 indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml       | 0
 indra/newview/skins/default/xui/zh/floater_pay.xml                        | 0
 indra/newview/skins/default/xui/zh/floater_pay_object.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_people.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_perm_prefs.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_picks.xml                      | 0
 indra/newview/skins/default/xui/zh/floater_places.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_post_process.xml               | 0
 indra/newview/skins/default/xui/zh/floater_preferences.xml                | 0
 indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml          | 0
 indra/newview/skins/default/xui/zh/floater_preview_animation.xml          | 0
 indra/newview/skins/default/xui/zh/floater_preview_gesture.xml            | 0
 indra/newview/skins/default/xui/zh/floater_preview_notecard.xml           | 0
 indra/newview/skins/default/xui/zh/floater_preview_sound.xml              | 0
 indra/newview/skins/default/xui/zh/floater_preview_texture.xml            | 0
 indra/newview/skins/default/xui/zh/floater_price_for_listing.xml          | 0
 indra/newview/skins/default/xui/zh/floater_publish_classified.xml         | 0
 indra/newview/skins/default/xui/zh/floater_region_debug_console.xml       | 0
 indra/newview/skins/default/xui/zh/floater_region_info.xml                | 0
 indra/newview/skins/default/xui/zh/floater_report_abuse.xml               | 0
 indra/newview/skins/default/xui/zh/floater_script_debug.xml               | 0
 indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml         | 0
 indra/newview/skins/default/xui/zh/floater_script_limits.xml              | 0
 indra/newview/skins/default/xui/zh/floater_script_preview.xml             | 0
 indra/newview/skins/default/xui/zh/floater_script_queue.xml               | 0
 indra/newview/skins/default/xui/zh/floater_script_search.xml              | 0
 indra/newview/skins/default/xui/zh/floater_search.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_select_key.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_sell_land.xml                  | 0
 indra/newview/skins/default/xui/zh/floater_settings_debug.xml             | 0
 indra/newview/skins/default/xui/zh/floater_snapshot.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_sound_devices.xml              | 0
 indra/newview/skins/default/xui/zh/floater_sound_preview.xml              | 0
 indra/newview/skins/default/xui/zh/floater_spellcheck.xml                 | 0
 indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml          | 0
 indra/newview/skins/default/xui/zh/floater_stats.xml                      | 0
 indra/newview/skins/default/xui/zh/floater_sys_well.xml                   | 0
 indra/newview/skins/default/xui/zh/floater_telehub.xml                    | 0
 indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml         | 0
 .../newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml  | 0
 indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml               | 0
 indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml     | 0
 indra/newview/skins/default/xui/zh/floater_tools.xml                      | 0
 indra/newview/skins/default/xui/zh/floater_top_objects.xml                | 0
 indra/newview/skins/default/xui/zh/floater_tos.xml                        | 0
 indra/newview/skins/default/xui/zh/floater_toybox.xml                     | 0
 indra/newview/skins/default/xui/zh/floater_translation_settings.xml       | 0
 indra/newview/skins/default/xui/zh/floater_url_entry.xml                  | 0
 indra/newview/skins/default/xui/zh/floater_voice_controls.xml             | 0
 indra/newview/skins/default/xui/zh/floater_voice_effect.xml               | 0
 indra/newview/skins/default/xui/zh/floater_web_content.xml                | 0
 indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml            | 0
 indra/newview/skins/default/xui/zh/floater_window_size.xml                | 0
 indra/newview/skins/default/xui/zh/floater_world_map.xml                  | 0
 indra/newview/skins/default/xui/zh/inspect_avatar.xml                     | 0
 indra/newview/skins/default/xui/zh/inspect_group.xml                      | 0
 indra/newview/skins/default/xui/zh/inspect_object.xml                     | 0
 indra/newview/skins/default/xui/zh/inspect_remote_object.xml              | 0
 indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml             | 0
 indra/newview/skins/default/xui/zh/menu_attachment_other.xml              | 0
 indra/newview/skins/default/xui/zh/menu_attachment_self.xml               | 0
 indra/newview/skins/default/xui/zh/menu_avatar_icon.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_avatar_other.xml                  | 0
 indra/newview/skins/default/xui/zh/menu_avatar_self.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_cof_attachment.xml                | 0
 indra/newview/skins/default/xui/zh/menu_cof_body_part.xml                 | 0
 indra/newview/skins/default/xui/zh/menu_cof_clothing.xml                  | 0
 indra/newview/skins/default/xui/zh/menu_cof_gear.xml                      | 0
 indra/newview/skins/default/xui/zh/menu_edit.xml                          | 0
 indra/newview/skins/default/xui/zh/menu_favorites.xml                     | 0
 indra/newview/skins/default/xui/zh/menu_gesture_gear.xml                  | 0
 indra/newview/skins/default/xui/zh/menu_group_plus.xml                    | 0
 indra/newview/skins/default/xui/zh/menu_hide_navbar.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml               | 0
 indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml               | 0
 indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml                 | 0
 indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml           | 0
 indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml           | 0
 indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml             | 0
 indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml             | 0
 indra/newview/skins/default/xui/zh/menu_inventory.xml                     | 0
 indra/newview/skins/default/xui/zh/menu_inventory_add.xml                 | 0
 indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml        | 0
 indra/newview/skins/default/xui/zh/menu_land.xml                          | 0
 indra/newview/skins/default/xui/zh/menu_landmark.xml                      | 0
 indra/newview/skins/default/xui/zh/menu_login.xml                         | 0
 indra/newview/skins/default/xui/zh/menu_media_ctrl.xml                    | 0
 indra/newview/skins/default/xui/zh/menu_mini_map.xml                      | 0
 indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml     | 0
 indra/newview/skins/default/xui/zh/menu_navbar.xml                        | 0
 indra/newview/skins/default/xui/zh/menu_nearby_chat.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_notification_well_button.xml      | 0
 indra/newview/skins/default/xui/zh/menu_object.xml                        | 0
 indra/newview/skins/default/xui/zh/menu_object_icon.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_outfit_gear.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_outfit_tab.xml                    | 0
 indra/newview/skins/default/xui/zh/menu_participant_list.xml              | 0
 indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml      | 0
 indra/newview/skins/default/xui/zh/menu_people_groups.xml                 | 0
 indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml       | 0
 indra/newview/skins/default/xui/zh/menu_people_nearby.xml                 | 0
 indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml     | 0
 indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml       | 0
 indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml       | 0
 indra/newview/skins/default/xui/zh/menu_picks.xml                         | 0
 indra/newview/skins/default/xui/zh/menu_picks_plus.xml                    | 0
 indra/newview/skins/default/xui/zh/menu_place.xml                         | 0
 indra/newview/skins/default/xui/zh/menu_place_add_button.xml              | 0
 indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml            | 0
 indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml          | 0
 indra/newview/skins/default/xui/zh/menu_profile_overflow.xml              | 0
 indra/newview/skins/default/xui/zh/menu_save_outfit.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_script_chiclet.xml                | 0
 indra/newview/skins/default/xui/zh/menu_slurl.xml                         | 0
 indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml         | 0
 indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml         | 0
 indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml          | 0
 indra/newview/skins/default/xui/zh/menu_text_editor.xml                   | 0
 indra/newview/skins/default/xui/zh/menu_toolbars.xml                      | 0
 indra/newview/skins/default/xui/zh/menu_topinfobar.xml                    | 0
 indra/newview/skins/default/xui/zh/menu_url_agent.xml                     | 0
 indra/newview/skins/default/xui/zh/menu_url_group.xml                     | 0
 indra/newview/skins/default/xui/zh/menu_url_http.xml                      | 0
 indra/newview/skins/default/xui/zh/menu_url_inventory.xml                 | 0
 indra/newview/skins/default/xui/zh/menu_url_map.xml                       | 0
 indra/newview/skins/default/xui/zh/menu_url_objectim.xml                  | 0
 indra/newview/skins/default/xui/zh/menu_url_parcel.xml                    | 0
 indra/newview/skins/default/xui/zh/menu_url_slapp.xml                     | 0
 indra/newview/skins/default/xui/zh/menu_url_slurl.xml                     | 0
 indra/newview/skins/default/xui/zh/menu_url_teleport.xml                  | 0
 indra/newview/skins/default/xui/zh/menu_viewer.xml                        | 0
 indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml            | 0
 indra/newview/skins/default/xui/zh/menu_wearing_gear.xml                  | 0
 indra/newview/skins/default/xui/zh/menu_wearing_tab.xml                   | 0
 indra/newview/skins/default/xui/zh/mime_types.xml                         | 0
 indra/newview/skins/default/xui/zh/mime_types_linux.xml                   | 0
 indra/newview/skins/default/xui/zh/mime_types_mac.xml                     | 0
 indra/newview/skins/default/xui/zh/notifications.xml                      | 0
 indra/newview/skins/default/xui/zh/panel_active_object_row.xml            | 0
 indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml          | 0
 indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml             | 0
 indra/newview/skins/default/xui/zh/panel_avatar_tag.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml          | 0
 indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml         | 0
 indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml    | 0
 indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml              | 0
 indra/newview/skins/default/xui/zh/panel_chat_header.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_classified_info.xml              | 0
 indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml     | 0
 indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml           | 0
 indra/newview/skins/default/xui/zh/panel_cof_wearables.xml                | 0
 indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml | 0
 indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml     | 0
 indra/newview/skins/default/xui/zh/panel_edit_alpha.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_classified.xml              | 0
 indra/newview/skins/default/xui/zh/panel_edit_eyes.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_edit_gloves.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_edit_hair.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_edit_jacket.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_edit_pants.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_physics.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_edit_pick.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_edit_profile.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_edit_shape.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_shirt.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_shoes.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_skin.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_edit_skirt.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_socks.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_edit_underpants.xml              | 0
 indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml              | 0
 indra/newview/skins/default/xui/zh/panel_edit_wearable.xml                | 0
 indra/newview/skins/default/xui/zh/panel_group_control_panel.xml          | 0
 indra/newview/skins/default/xui/zh/panel_group_general.xml                | 0
 indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml          | 0
 indra/newview/skins/default/xui/zh/panel_group_invite.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_group_land_money.xml             | 0
 indra/newview/skins/default/xui/zh/panel_group_list_item.xml              | 0
 indra/newview/skins/default/xui/zh/panel_group_notices.xml                | 0
 indra/newview/skins/default/xui/zh/panel_group_notify.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_group_roles.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_im_control_panel.xml             | 0
 indra/newview/skins/default/xui/zh/panel_instant_message.xml              | 0
 indra/newview/skins/default/xui/zh/panel_inventory_item.xml               | 0
 indra/newview/skins/default/xui/zh/panel_landmark_info.xml                | 0
 indra/newview/skins/default/xui/zh/panel_landmarks.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_login.xml                        | 0
 indra/newview/skins/default/xui/zh/panel_main_inventory.xml               | 0
 indra/newview/skins/default/xui/zh/panel_me.xml                           | 0
 indra/newview/skins/default/xui/zh/panel_media_settings_general.xml       | 0
 indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml   | 0
 indra/newview/skins/default/xui/zh/panel_media_settings_security.xml      | 0
 indra/newview/skins/default/xui/zh/panel_navigation_bar.xml               | 0
 indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml               | 0
 indra/newview/skins/default/xui/zh/panel_nearby_chat.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml              | 0
 indra/newview/skins/default/xui/zh/panel_nearby_media.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_notify_textbox.xml               | 0
 indra/newview/skins/default/xui/zh/panel_online_status_toast.xml          | 0
 indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml             | 0
 indra/newview/skins/default/xui/zh/panel_outfit_edit.xml                  | 0
 indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml            | 0
 .../newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml | 0
 indra/newview/skins/default/xui/zh/panel_outfits_list.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml              | 0
 indra/newview/skins/default/xui/zh/panel_people.xml                       | 0
 indra/newview/skins/default/xui/zh/panel_pick_info.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_picks.xml                        | 0
 indra/newview/skins/default/xui/zh/panel_place_profile.xml                | 0
 indra/newview/skins/default/xui/zh/panel_places.xml                       | 0
 indra/newview/skins/default/xui/zh/panel_postcard_message.xml             | 0
 indra/newview/skins/default/xui/zh/panel_postcard_settings.xml            | 0
 indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml         | 0
 indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml           | 0
 indra/newview/skins/default/xui/zh/panel_preferences_chat.xml             | 0
 indra/newview/skins/default/xui/zh/panel_preferences_colors.xml           | 0
 indra/newview/skins/default/xui/zh/panel_preferences_general.xml          | 0
 indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml        | 0
 indra/newview/skins/default/xui/zh/panel_preferences_move.xml             | 0
 indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml          | 0
 indra/newview/skins/default/xui/zh/panel_preferences_setup.xml            | 0
 indra/newview/skins/default/xui/zh/panel_preferences_sound.xml            | 0
 indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml          | 0
 indra/newview/skins/default/xui/zh/panel_region_covenant.xml              | 0
 indra/newview/skins/default/xui/zh/panel_region_debug.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_region_environment.xml           | 0
 indra/newview/skins/default/xui/zh/panel_region_estate.xml                | 0
 indra/newview/skins/default/xui/zh/panel_region_general.xml               | 0
 indra/newview/skins/default/xui/zh/panel_region_terrain.xml               | 0
 indra/newview/skins/default/xui/zh/panel_script_ed.xml                    | 0
 indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml      | 0
 indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml  | 0
 indra/newview/skins/default/xui/zh/panel_script_question_toast.xml        | 0
 indra/newview/skins/default/xui/zh/panel_scrolling_param.xml              | 0
 indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml         | 0
 indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml        | 0
 indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml           | 0
 indra/newview/skins/default/xui/zh/panel_snapshot_local.xml               | 0
 indra/newview/skins/default/xui/zh/panel_snapshot_options.xml             | 0
 indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml            | 0
 indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml             | 0
 indra/newview/skins/default/xui/zh/panel_sound_devices.xml                | 0
 indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml            | 0
 indra/newview/skins/default/xui/zh/panel_status_bar.xml                   | 0
 indra/newview/skins/default/xui/zh/panel_teleport_history.xml             | 0
 indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml        | 0
 indra/newview/skins/default/xui/zh/panel_voice_effect.xml                 | 0
 indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml              | 0
 indra/newview/skins/default/xui/zh/panel_world_map.xml                    | 0
 indra/newview/skins/default/xui/zh/role_actions.xml                       | 0
 indra/newview/skins/default/xui/zh/sidepanel_appearance.xml               | 0
 indra/newview/skins/default/xui/zh/sidepanel_inventory.xml                | 0
 indra/newview/skins/default/xui/zh/sidepanel_item_info.xml                | 0
 indra/newview/skins/default/xui/zh/sidepanel_task_info.xml                | 0
 indra/newview/skins/default/xui/zh/strings.xml                            | 0
 indra/newview/skins/default/xui/zh/teleport_strings.xml                   | 0
 4014 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_animation_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_bottomtray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_bottomtray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_region_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_side_tray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/da/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_notifications_channel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_sys_well_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/de/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/accordion_drag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/accordion_parent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/alert_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/alert_check_box.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/alert_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/alert_line_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/favorites_bar_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_aaa.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_conversation_log.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_conversation_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_my_web_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_checkbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_combobox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_inspectors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_layout.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_line_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_list_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_slider.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_spinner.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_toolbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_test_widgets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_ui_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_voice_volume.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_web_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/fonts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/inspect_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/main_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_conversation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_im_conversation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_participant_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_friends_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_groups_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_people_recent_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/notification_visibility.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_chat_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_chat_separator.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_generic_tip.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_hint.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_hint_image.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_notifications_channel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_pick_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_progress.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_sys_well_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_toolbar_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/accordion.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/badge.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/chat_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/chat_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/check_box.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/color_swatch.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/combo_box.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/context_menu.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/drop_down.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/expandable_text.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/filter_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/floater.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/flyout_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/group_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/hint_popup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/inspector.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/layout_stack.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/line_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/list_view.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/location_input.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/multi_slider.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/name_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/name_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/output_monitor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/progress_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/radio_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/radio_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/scroll_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/scroll_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/search_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/side_tray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/slider.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/slider_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/spinner.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/split_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/tab_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/talk_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/text.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/textbase.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/texture_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/time.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/tool_tip.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/toolbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/view_border.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/web_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/widgets/window_shade.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/es/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/fonts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/fr/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/it/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ja/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_animation_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_bottomtray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_bottomtray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_region_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_side_tray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pl/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/language_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/xui_version.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_aaa.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_aaa.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/tr/teleport_strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_aaa.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_about.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_about_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_activeim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_auction.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_autoreplace.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_beacons.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_build_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_bumps.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_buy_contents.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_buy_currency.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_buy_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_buy_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_camera.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_choose_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_color_picker.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_critical.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_destinations.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_display_name.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_environment_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_event.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_fast_timers.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_font_test.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_god_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_help_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_how_to.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_hud.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_im_container.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_im_session.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_image_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_import_collada.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_incoming_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_inspect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_joystick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_lagmeter.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_land_holdings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_media_browser.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_media_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_model_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_moveview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_mute_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_my_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_my_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_notification.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_notifications_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_object_weights.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_openobject.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_pay.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_pay_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_post_process.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preferences.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preview_animation.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preview_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_preview_texture.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_publish_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_region_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_report_abuse.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_script_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_script_limits.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_script_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_script_queue.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_script_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_search.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_select_key.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_sell_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_settings_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_snapshot.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_sound_preview.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_spellcheck.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_stats.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_sys_well.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_telehub.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_tools.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_top_objects.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_tos.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_toybox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_translation_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_url_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_voice_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_web_content.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_window_size.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/floater_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/inspect_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/inspect_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/inspect_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/inspect_remote_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_cof_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_favorites.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_group_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inventory_add.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_land.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_mini_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_navbar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_object.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_object_icon.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_participant_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_groups.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_nearby.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_picks_plus.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_place.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_place_add_button.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_save_outfit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_text_editor.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_toolbars.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_topinfobar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_agent.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_group.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_http.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_objectim.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_parcel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_slapp.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_slurl.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_url_teleport.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_viewer.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/mime_types_linux.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/mime_types_mac.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/notifications.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_active_object_row.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_chat_header.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_classified_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_classified.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_hair.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_pants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_physics.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_pick.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_shape.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_skin.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_socks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_invite.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_land_money.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_list_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_notices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_notify.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_group_roles.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_instant_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_inventory_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_landmark_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_landmarks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_login.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_main_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_me.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_nearby_media.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_outfits_list.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_people.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_pick_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_picks.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_place_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_places.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_postcard_message.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_move.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_region_covenant.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_region_debug.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_region_environment.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_region_estate.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_region_general.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_region_terrain.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_script_ed.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_sound_devices.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_status_bar.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_teleport_history.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_voice_effect.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/panel_world_map.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/role_actions.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/strings.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/zh/teleport_strings.xml

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

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_activeim.xml b/indra/newview/skins/default/xui/da/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_display_name.xml b/indra/newview/skins/default/xui/da/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_gesture.xml b/indra/newview/skins/default/xui/da/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_hud.xml b/indra/newview/skins/default/xui/da/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_im_session.xml b/indra/newview/skins/default/xui/da/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_import_collada.xml b/indra/newview/skins/default/xui/da/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_media_settings.xml b/indra/newview/skins/default/xui/da/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_region_info.xml b/indra/newview/skins/default/xui/da/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_search.xml b/indra/newview/skins/default/xui/da/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_url_entry.xml b/indra/newview/skins/default/xui/da/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_web_content.xml b/indra/newview/skins/default/xui/da/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/inspect_group.xml b/indra/newview/skins/default/xui/da/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/inspect_remote_object.xml b/indra/newview/skins/default/xui/da/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_other.xml b/indra/newview/skins/default/xui/da/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_other.xml b/indra/newview/skins/default/xui/da/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_cof_gear.xml b/indra/newview/skins/default/xui/da/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_edit.xml b/indra/newview/skins/default/xui/da/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_favorites.xml b/indra/newview/skins/default/xui/da/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_group_plus.xml b/indra/newview/skins/default/xui/da/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_land.xml b/indra/newview/skins/default/xui/da/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_landmark.xml b/indra/newview/skins/default/xui/da/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_navbar.xml b/indra/newview/skins/default/xui/da/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_object_icon.xml b/indra/newview/skins/default/xui/da/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_picks_plus.xml b/indra/newview/skins/default/xui/da/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_place.xml b/indra/newview/skins/default/xui/da/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_save_outfit.xml b/indra/newview/skins/default/xui/da/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_text_editor.xml b/indra/newview/skins/default/xui/da/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_agent.xml b/indra/newview/skins/default/xui/da/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_group.xml b/indra/newview/skins/default/xui/da/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_http.xml b/indra/newview/skins/default/xui/da/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_inventory.xml b/indra/newview/skins/default/xui/da/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_map.xml b/indra/newview/skins/default/xui/da/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_objectim.xml b/indra/newview/skins/default/xui/da/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_parcel.xml b/indra/newview/skins/default/xui/da/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_slapp.xml b/indra/newview/skins/default/xui/da/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_slurl.xml b/indra/newview/skins/default/xui/da/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_url_teleport.xml b/indra/newview/skins/default/xui/da/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/mime_types.xml b/indra/newview/skins/default/xui/da/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/mime_types_linux.xml b/indra/newview/skins/default/xui/da/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/mime_types_mac.xml b/indra/newview/skins/default/xui/da/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_active_object_row.xml b/indra/newview/skins/default/xui/da/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_hair.xml b/indra/newview/skins/default/xui/da/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pants.xml b/indra/newview/skins/default/xui/da/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_physics.xml b/indra/newview/skins/default/xui/da/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skin.xml b/indra/newview/skins/default/xui/da/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_socks.xml b/indra/newview/skins/default/xui/da/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_inventory_item.xml b/indra/newview/skins/default/xui/da/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_list.xml b/indra/newview/skins/default/xui/da/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_picks.xml b/indra/newview/skins/default/xui/da/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_move.xml b/indra/newview/skins/default/xui/da/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_region_debug.xml b/indra/newview/skins/default/xui/da/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_script_ed.xml b/indra/newview/skins/default/xui/da/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_sound_devices.xml b/indra/newview/skins/default/xui/da/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/role_actions.xml b/indra/newview/skins/default/xui/da/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_activeim.xml b/indra/newview/skins/default/xui/de/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_avatar.xml b/indra/newview/skins/default/xui/de/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_choose_group.xml b/indra/newview/skins/default/xui/de/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_critical.xml b/indra/newview/skins/default/xui/de/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_destinations.xml b/indra/newview/skins/default/xui/de/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_display_name.xml b/indra/newview/skins/default/xui/de/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_fast_timers.xml b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_font_test.xml b/indra/newview/skins/default/xui/de/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_how_to.xml b/indra/newview/skins/default/xui/de/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_import_collada.xml b/indra/newview/skins/default/xui/de/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_my_appearance.xml b/indra/newview/skins/default/xui/de/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_my_inventory.xml b/indra/newview/skins/default/xui/de/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_notification.xml b/indra/newview/skins/default/xui/de/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/indra/newview/skins/default/xui/de/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_object_weights.xml b/indra/newview/skins/default/xui/de/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_people.xml b/indra/newview/skins/default/xui/de/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_places.xml b/indra/newview/skins/default/xui/de/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/indra/newview/skins/default/xui/de/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug.xml b/indra/newview/skins/default/xui/de/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_script_limits.xml b/indra/newview/skins/default/xui/de/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_sound_preview.xml b/indra/newview/skins/default/xui/de/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck.xml b/indra/newview/skins/default/xui/de/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_toybox.xml b/indra/newview/skins/default/xui/de/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_translation_settings.xml b/indra/newview/skins/default/xui/de/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/inspect_remote_object.xml b/indra/newview/skins/default/xui/de/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/language_settings.xml b/indra/newview/skins/default/xui/de/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_edit.xml b/indra/newview/skins/default/xui/de/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_favorites.xml b/indra/newview/skins/default/xui/de/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_group_plus.xml b/indra/newview/skins/default/xui/de/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_landmark.xml b/indra/newview/skins/default/xui/de/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_picks.xml b/indra/newview/skins/default/xui/de/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_picks_plus.xml b/indra/newview/skins/default/xui/de/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_place.xml b/indra/newview/skins/default/xui/de/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_save_outfit.xml b/indra/newview/skins/default/xui/de/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_slurl.xml b/indra/newview/skins/default/xui/de/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_toolbars.xml b/indra/newview/skins/default/xui/de/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_group.xml b/indra/newview/skins/default/xui/de/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_http.xml b/indra/newview/skins/default/xui/de/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_inventory.xml b/indra/newview/skins/default/xui/de/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_map.xml b/indra/newview/skins/default/xui/de/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_parcel.xml b/indra/newview/skins/default/xui/de/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_slapp.xml b/indra/newview/skins/default/xui/de/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_slurl.xml b/indra/newview/skins/default/xui/de/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_url_teleport.xml b/indra/newview/skins/default/xui/de/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/mime_types_linux.xml b/indra/newview/skins/default/xui/de/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/mime_types_mac.xml b/indra/newview/skins/default/xui/de/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_active_object_row.xml b/indra/newview/skins/default/xui/de/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_hair.xml b/indra/newview/skins/default/xui/de/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pants.xml b/indra/newview/skins/default/xui/de/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_physics.xml b/indra/newview/skins/default/xui/de/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_socks.xml b/indra/newview/skins/default/xui/de/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_inventory_item.xml b/indra/newview/skins/default/xui/de/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_pick_info.xml b/indra/newview/skins/default/xui/de/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/panel_world_map.xml b/indra/newview/skins/default/xui/de/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/de/xui_version.xml b/indra/newview/skins/default/xui/de/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/name_editor.xml b/indra/newview/skins/default/xui/en/widgets/name_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/name_list.xml b/indra/newview/skins/default/xui/en/widgets/name_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/slider.xml b/indra/newview/skins/default/xui/en/widgets/slider.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/view_border.xml b/indra/newview/skins/default/xui/en/widgets/view_border.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/web_browser.xml b/indra/newview/skins/default/xui/en/widgets/web_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/widgets/window_shade.xml b/indra/newview/skins/default/xui/en/widgets/window_shade.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/en/xui_version.xml b/indra/newview/skins/default/xui/en/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_activeim.xml b/indra/newview/skins/default/xui/es/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_avatar.xml b/indra/newview/skins/default/xui/es/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_destinations.xml b/indra/newview/skins/default/xui/es/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_how_to.xml b/indra/newview/skins/default/xui/es/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_media_settings.xml b/indra/newview/skins/default/xui/es/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_my_appearance.xml b/indra/newview/skins/default/xui/es/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_my_inventory.xml b/indra/newview/skins/default/xui/es/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_object_weights.xml b/indra/newview/skins/default/xui/es/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_people.xml b/indra/newview/skins/default/xui/es/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_picks.xml b/indra/newview/skins/default/xui/es/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_places.xml b/indra/newview/skins/default/xui/es/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_region_info.xml b/indra/newview/skins/default/xui/es/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck.xml b/indra/newview/skins/default/xui/es/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_sys_well.xml b/indra/newview/skins/default/xui/es/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_toybox.xml b/indra/newview/skins/default/xui/es/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_translation_settings.xml b/indra/newview/skins/default/xui/es/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_web_content.xml b/indra/newview/skins/default/xui/es/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/inspect_group.xml b/indra/newview/skins/default/xui/es/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/inspect_remote_object.xml b/indra/newview/skins/default/xui/es/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/language_settings.xml b/indra/newview/skins/default/xui/es/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_edit.xml b/indra/newview/skins/default/xui/es/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_favorites.xml b/indra/newview/skins/default/xui/es/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_group_plus.xml b/indra/newview/skins/default/xui/es/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_landmark.xml b/indra/newview/skins/default/xui/es/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_navbar.xml b/indra/newview/skins/default/xui/es/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_picks.xml b/indra/newview/skins/default/xui/es/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_picks_plus.xml b/indra/newview/skins/default/xui/es/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_place.xml b/indra/newview/skins/default/xui/es/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_save_outfit.xml b/indra/newview/skins/default/xui/es/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_toolbars.xml b/indra/newview/skins/default/xui/es/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_group.xml b/indra/newview/skins/default/xui/es/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_http.xml b/indra/newview/skins/default/xui/es/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_inventory.xml b/indra/newview/skins/default/xui/es/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_map.xml b/indra/newview/skins/default/xui/es/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_parcel.xml b/indra/newview/skins/default/xui/es/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_slapp.xml b/indra/newview/skins/default/xui/es/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_slurl.xml b/indra/newview/skins/default/xui/es/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_url_teleport.xml b/indra/newview/skins/default/xui/es/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/mime_types.xml b/indra/newview/skins/default/xui/es/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_active_object_row.xml b/indra/newview/skins/default/xui/es/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_hair.xml b/indra/newview/skins/default/xui/es/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pants.xml b/indra/newview/skins/default/xui/es/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_physics.xml b/indra/newview/skins/default/xui/es/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_skin.xml b/indra/newview/skins/default/xui/es/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_socks.xml b/indra/newview/skins/default/xui/es/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_notify.xml b/indra/newview/skins/default/xui/es/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_inventory_item.xml b/indra/newview/skins/default/xui/es/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_landmarks.xml b/indra/newview/skins/default/xui/es/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_pick_info.xml b/indra/newview/skins/default/xui/es/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_message.xml b/indra/newview/skins/default/xui/es/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_activeim.xml b/indra/newview/skins/default/xui/fr/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar.xml b/indra/newview/skins/default/xui/fr/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_destinations.xml b/indra/newview/skins/default/xui/fr/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_import_collada.xml b/indra/newview/skins/default/xui/fr/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_media_settings.xml b/indra/newview/skins/default/xui/fr/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_object_weights.xml b/indra/newview/skins/default/xui/fr/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_places.xml b/indra/newview/skins/default/xui/fr/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_script_limits.xml b/indra/newview/skins/default/xui/fr/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_toybox.xml b/indra/newview/skins/default/xui/fr/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/language_settings.xml b/indra/newview/skins/default/xui/fr/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_edit.xml b/indra/newview/skins/default/xui/fr/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_favorites.xml b/indra/newview/skins/default/xui/fr/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_group_plus.xml b/indra/newview/skins/default/xui/fr/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_navbar.xml b/indra/newview/skins/default/xui/fr/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_list.xml b/indra/newview/skins/default/xui/fr/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_picks.xml b/indra/newview/skins/default/xui/fr/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_toolbars.xml b/indra/newview/skins/default/xui/fr/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_group.xml b/indra/newview/skins/default/xui/fr/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_http.xml b/indra/newview/skins/default/xui/fr/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_map.xml b/indra/newview/skins/default/xui/fr/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/mime_types_linux.xml b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/mime_types_mac.xml b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notify.xml b/indra/newview/skins/default/xui/fr/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_activeim.xml b/indra/newview/skins/default/xui/it/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_auction.xml b/indra/newview/skins/default/xui/it/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_avatar.xml b/indra/newview/skins/default/xui/it/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_choose_group.xml b/indra/newview/skins/default/xui/it/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_critical.xml b/indra/newview/skins/default/xui/it/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_destinations.xml b/indra/newview/skins/default/xui/it/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_display_name.xml b/indra/newview/skins/default/xui/it/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_fast_timers.xml b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_font_test.xml b/indra/newview/skins/default/xui/it/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_god_tools.xml b/indra/newview/skins/default/xui/it/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_help_browser.xml b/indra/newview/skins/default/xui/it/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_how_to.xml b/indra/newview/skins/default/xui/it/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_hud.xml b/indra/newview/skins/default/xui/it/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_import_collada.xml b/indra/newview/skins/default/xui/it/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_media_settings.xml b/indra/newview/skins/default/xui/it/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_my_appearance.xml b/indra/newview/skins/default/xui/it/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_my_inventory.xml b/indra/newview/skins/default/xui/it/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_object_weights.xml b/indra/newview/skins/default/xui/it/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_openobject.xml b/indra/newview/skins/default/xui/it/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_people.xml b/indra/newview/skins/default/xui/it/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_picks.xml b/indra/newview/skins/default/xui/it/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_places.xml b/indra/newview/skins/default/xui/it/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_post_process.xml b/indra/newview/skins/default/xui/it/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preview_sound.xml b/indra/newview/skins/default/xui/it/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_publish_classified.xml b/indra/newview/skins/default/xui/it/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_region_info.xml b/indra/newview/skins/default/xui/it/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_script_debug.xml b/indra/newview/skins/default/xui/it/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_script_limits.xml b/indra/newview/skins/default/xui/it/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_script_preview.xml b/indra/newview/skins/default/xui/it/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_select_key.xml b/indra/newview/skins/default/xui/it/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_sound_preview.xml b/indra/newview/skins/default/xui/it/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck.xml b/indra/newview/skins/default/xui/it/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_sys_well.xml b/indra/newview/skins/default/xui/it/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_toybox.xml b/indra/newview/skins/default/xui/it/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_translation_settings.xml b/indra/newview/skins/default/xui/it/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/inspect_group.xml b/indra/newview/skins/default/xui/it/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/inspect_remote_object.xml b/indra/newview/skins/default/xui/it/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/language_settings.xml b/indra/newview/skins/default/xui/it/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_edit.xml b/indra/newview/skins/default/xui/it/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_favorites.xml b/indra/newview/skins/default/xui/it/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_group_plus.xml b/indra/newview/skins/default/xui/it/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_landmark.xml b/indra/newview/skins/default/xui/it/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_navbar.xml b/indra/newview/skins/default/xui/it/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_picks.xml b/indra/newview/skins/default/xui/it/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_picks_plus.xml b/indra/newview/skins/default/xui/it/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_place.xml b/indra/newview/skins/default/xui/it/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_save_outfit.xml b/indra/newview/skins/default/xui/it/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_slurl.xml b/indra/newview/skins/default/xui/it/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_toolbars.xml b/indra/newview/skins/default/xui/it/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_topinfobar.xml b/indra/newview/skins/default/xui/it/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_group.xml b/indra/newview/skins/default/xui/it/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_http.xml b/indra/newview/skins/default/xui/it/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_inventory.xml b/indra/newview/skins/default/xui/it/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_map.xml b/indra/newview/skins/default/xui/it/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_parcel.xml b/indra/newview/skins/default/xui/it/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_slapp.xml b/indra/newview/skins/default/xui/it/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_slurl.xml b/indra/newview/skins/default/xui/it/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_url_teleport.xml b/indra/newview/skins/default/xui/it/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/mime_types.xml b/indra/newview/skins/default/xui/it/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/mime_types_linux.xml b/indra/newview/skins/default/xui/it/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/mime_types_mac.xml b/indra/newview/skins/default/xui/it/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_active_object_row.xml b/indra/newview/skins/default/xui/it/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_classified_info.xml b/indra/newview/skins/default/xui/it/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_hair.xml b/indra/newview/skins/default/xui/it/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pants.xml b/indra/newview/skins/default/xui/it/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_physics.xml b/indra/newview/skins/default/xui/it/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skin.xml b/indra/newview/skins/default/xui/it/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_notify.xml b/indra/newview/skins/default/xui/it/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_inventory_item.xml b/indra/newview/skins/default/xui/it/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_landmarks.xml b/indra/newview/skins/default/xui/it/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_media.xml b/indra/newview/skins/default/xui/it/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_pick_info.xml b/indra/newview/skins/default/xui/it/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_picks.xml b/indra/newview/skins/default/xui/it/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_message.xml b/indra/newview/skins/default/xui/it/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history.xml b/indra/newview/skins/default/xui/it/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_pick_info.xml b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_activeim.xml b/indra/newview/skins/default/xui/pl/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_display_name.xml b/indra/newview/skins/default/xui/pl/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_help_browser.xml b/indra/newview/skins/default/xui/pl/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_im_container.xml b/indra/newview/skins/default/xui/pl/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_media_settings.xml b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_script_limits.xml b/indra/newview/skins/default/xui/pl/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_search.xml b/indra/newview/skins/default/xui/pl/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_sys_well.xml b/indra/newview/skins/default/xui/pl/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_web_content.xml b/indra/newview/skins/default/xui/pl/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_window_size.xml b/indra/newview/skins/default/xui/pl/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_edit.xml b/indra/newview/skins/default/xui/pl/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_favorites.xml b/indra/newview/skins/default/xui/pl/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_group_plus.xml b/indra/newview/skins/default/xui/pl/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_land.xml b/indra/newview/skins/default/xui/pl/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_landmark.xml b/indra/newview/skins/default/xui/pl/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_object_icon.xml b/indra/newview/skins/default/xui/pl/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups.xml b/indra/newview/skins/default/xui/pl/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_picks.xml b/indra/newview/skins/default/xui/pl/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_place.xml b/indra/newview/skins/default/xui/pl/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_text_editor.xml b/indra/newview/skins/default/xui/pl/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_group.xml b/indra/newview/skins/default/xui/pl/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_http.xml b/indra/newview/skins/default/xui/pl/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_map.xml b/indra/newview/skins/default/xui/pl/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/mime_types_linux.xml b/indra/newview/skins/default/xui/pl/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_classified_info.xml b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notify.xml b/indra/newview/skins/default/xui/pl/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_landmarks.xml b/indra/newview/skins/default/xui/pl/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_activeim.xml b/indra/newview/skins/default/xui/pt/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar.xml b/indra/newview/skins/default/xui/pt/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_critical.xml b/indra/newview/skins/default/xui/pt/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_destinations.xml b/indra/newview/skins/default/xui/pt/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_display_name.xml b/indra/newview/skins/default/xui/pt/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_font_test.xml b/indra/newview/skins/default/xui/pt/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_how_to.xml b/indra/newview/skins/default/xui/pt/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_import_collada.xml b/indra/newview/skins/default/xui/pt/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_media_settings.xml b/indra/newview/skins/default/xui/pt/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_object_weights.xml b/indra/newview/skins/default/xui/pt/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_openobject.xml b/indra/newview/skins/default/xui/pt/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_people.xml b/indra/newview/skins/default/xui/pt/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_picks.xml b/indra/newview/skins/default/xui/pt/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_places.xml b/indra/newview/skins/default/xui/pt/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_post_process.xml b/indra/newview/skins/default/xui/pt/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_toybox.xml b/indra/newview/skins/default/xui/pt/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/inspect_group.xml b/indra/newview/skins/default/xui/pt/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/language_settings.xml b/indra/newview/skins/default/xui/pt/language_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_edit.xml b/indra/newview/skins/default/xui/pt/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_favorites.xml b/indra/newview/skins/default/xui/pt/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_group_plus.xml b/indra/newview/skins/default/xui/pt/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_landmark.xml b/indra/newview/skins/default/xui/pt/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_mini_map.xml b/indra/newview/skins/default/xui/pt/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_navbar.xml b/indra/newview/skins/default/xui/pt/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_picks.xml b/indra/newview/skins/default/xui/pt/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_place.xml b/indra/newview/skins/default/xui/pt/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_toolbars.xml b/indra/newview/skins/default/xui/pt/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_group.xml b/indra/newview/skins/default/xui/pt/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_http.xml b/indra/newview/skins/default/xui/pt/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_map.xml b/indra/newview/skins/default/xui/pt/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/mime_types_linux.xml b/indra/newview/skins/default/xui/pt/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/mime_types_mac.xml b/indra/newview/skins/default/xui/pt/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notify.xml b/indra/newview/skins/default/xui/pt/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_pick_info.xml b/indra/newview/skins/default/xui/pt/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/pt/xui_version.xml b/indra/newview/skins/default/xui/pt/xui_version.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_aaa.xml b/indra/newview/skins/default/xui/ru/floater_aaa.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_activeim.xml b/indra/newview/skins/default/xui/ru/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar.xml b/indra/newview/skins/default/xui/ru/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_beacons.xml b/indra/newview/skins/default/xui/ru/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_build_options.xml b/indra/newview/skins/default/xui/ru/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_bumps.xml b/indra/newview/skins/default/xui/ru/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_land.xml b/indra/newview/skins/default/xui/ru/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_object.xml b/indra/newview/skins/default/xui/ru/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_choose_group.xml b/indra/newview/skins/default/xui/ru/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_color_picker.xml b/indra/newview/skins/default/xui/ru/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_critical.xml b/indra/newview/skins/default/xui/ru/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_display_name.xml b/indra/newview/skins/default/xui/ru/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_event.xml b/indra/newview/skins/default/xui/ru/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_font_test.xml b/indra/newview/skins/default/xui/ru/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_gesture.xml b/indra/newview/skins/default/xui/ru/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_god_tools.xml b/indra/newview/skins/default/xui/ru/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_help_browser.xml b/indra/newview/skins/default/xui/ru/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_how_to.xml b/indra/newview/skins/default/xui/ru/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_hud.xml b/indra/newview/skins/default/xui/ru/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_image_preview.xml b/indra/newview/skins/default/xui/ru/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_import_collada.xml b/indra/newview/skins/default/xui/ru/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_inspect.xml b/indra/newview/skins/default/xui/ru/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_map.xml b/indra/newview/skins/default/xui/ru/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_media_browser.xml b/indra/newview/skins/default/xui/ru/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_media_settings.xml b/indra/newview/skins/default/xui/ru/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_moveview.xml b/indra/newview/skins/default/xui/ru/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_mute_object.xml b/indra/newview/skins/default/xui/ru/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_notification.xml b/indra/newview/skins/default/xui/ru/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_object_weights.xml b/indra/newview/skins/default/xui/ru/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_openobject.xml b/indra/newview/skins/default/xui/ru/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_pay.xml b/indra/newview/skins/default/xui/ru/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/indra/newview/skins/default/xui/ru/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_people.xml b/indra/newview/skins/default/xui/ru/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_picks.xml b/indra/newview/skins/default/xui/ru/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_places.xml b/indra/newview/skins/default/xui/ru/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_post_process.xml b/indra/newview/skins/default/xui/ru/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_region_info.xml b/indra/newview/skins/default/xui/ru/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug.xml b/indra/newview/skins/default/xui/ru/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_script_limits.xml b/indra/newview/skins/default/xui/ru/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_script_preview.xml b/indra/newview/skins/default/xui/ru/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_script_queue.xml b/indra/newview/skins/default/xui/ru/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_script_search.xml b/indra/newview/skins/default/xui/ru/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_search.xml b/indra/newview/skins/default/xui/ru/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_select_key.xml b/indra/newview/skins/default/xui/ru/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_sell_land.xml b/indra/newview/skins/default/xui/ru/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_sys_well.xml b/indra/newview/skins/default/xui/ru/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_telehub.xml b/indra/newview/skins/default/xui/ru/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_top_objects.xml b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_toybox.xml b/indra/newview/skins/default/xui/ru/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_url_entry.xml b/indra/newview/skins/default/xui/ru/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_web_content.xml b/indra/newview/skins/default/xui/ru/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/floater_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/inspect_avatar.xml b/indra/newview/skins/default/xui/ru/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/inspect_group.xml b/indra/newview/skins/default/xui/ru/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/inspect_object.xml b/indra/newview/skins/default/xui/ru/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_edit.xml b/indra/newview/skins/default/xui/ru/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_favorites.xml b/indra/newview/skins/default/xui/ru/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_group_plus.xml b/indra/newview/skins/default/xui/ru/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_landmark.xml b/indra/newview/skins/default/xui/ru/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_navbar.xml b/indra/newview/skins/default/xui/ru/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_list.xml b/indra/newview/skins/default/xui/ru/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_picks.xml b/indra/newview/skins/default/xui/ru/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_place.xml b/indra/newview/skins/default/xui/ru/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_slurl.xml b/indra/newview/skins/default/xui/ru/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_text_editor.xml b/indra/newview/skins/default/xui/ru/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_toolbars.xml b/indra/newview/skins/default/xui/ru/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_group.xml b/indra/newview/skins/default/xui/ru/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_http.xml b/indra/newview/skins/default/xui/ru/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_map.xml b/indra/newview/skins/default/xui/ru/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/mime_types_linux.xml b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/mime_types_mac.xml b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_chat_header.xml b/indra/newview/skins/default/xui/ru/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_classified_info.xml b/indra/newview/skins/default/xui/ru/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_notices.xml b/indra/newview/skins/default/xui/ru/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_notify.xml b/indra/newview/skins/default/xui/ru/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_group_roles.xml b/indra/newview/skins/default/xui/ru/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_instant_message.xml b/indra/newview/skins/default/xui/ru/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_landmarks.xml b/indra/newview/skins/default/xui/ru/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_me.xml b/indra/newview/skins/default/xui/ru/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_pick_info.xml b/indra/newview/skins/default/xui/ru/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_picks.xml b/indra/newview/skins/default/xui/ru/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_place_profile.xml b/indra/newview/skins/default/xui/ru/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_places.xml b/indra/newview/skins/default/xui/ru/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_region_environment.xml b/indra/newview/skins/default/xui/ru/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/panel_world_map.xml b/indra/newview/skins/default/xui/ru/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_aaa.xml b/indra/newview/skins/default/xui/tr/floater_aaa.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_activeim.xml b/indra/newview/skins/default/xui/tr/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_auction.xml b/indra/newview/skins/default/xui/tr/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar.xml b/indra/newview/skins/default/xui/tr/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_beacons.xml b/indra/newview/skins/default/xui/tr/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_build_options.xml b/indra/newview/skins/default/xui/tr/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_bumps.xml b/indra/newview/skins/default/xui/tr/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_land.xml b/indra/newview/skins/default/xui/tr/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_object.xml b/indra/newview/skins/default/xui/tr/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_camera.xml b/indra/newview/skins/default/xui/tr/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_choose_group.xml b/indra/newview/skins/default/xui/tr/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_color_picker.xml b/indra/newview/skins/default/xui/tr/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_critical.xml b/indra/newview/skins/default/xui/tr/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_destinations.xml b/indra/newview/skins/default/xui/tr/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_display_name.xml b/indra/newview/skins/default/xui/tr/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_event.xml b/indra/newview/skins/default/xui/tr/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_font_test.xml b/indra/newview/skins/default/xui/tr/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_gesture.xml b/indra/newview/skins/default/xui/tr/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_god_tools.xml b/indra/newview/skins/default/xui/tr/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_help_browser.xml b/indra/newview/skins/default/xui/tr/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_how_to.xml b/indra/newview/skins/default/xui/tr/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_hud.xml b/indra/newview/skins/default/xui/tr/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_image_preview.xml b/indra/newview/skins/default/xui/tr/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_import_collada.xml b/indra/newview/skins/default/xui/tr/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_inspect.xml b/indra/newview/skins/default/xui/tr/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_joystick.xml b/indra/newview/skins/default/xui/tr/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_map.xml b/indra/newview/skins/default/xui/tr/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_media_browser.xml b/indra/newview/skins/default/xui/tr/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_media_settings.xml b/indra/newview/skins/default/xui/tr/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_moveview.xml b/indra/newview/skins/default/xui/tr/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_mute_object.xml b/indra/newview/skins/default/xui/tr/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_notification.xml b/indra/newview/skins/default/xui/tr/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_object_weights.xml b/indra/newview/skins/default/xui/tr/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_openobject.xml b/indra/newview/skins/default/xui/tr/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_pay.xml b/indra/newview/skins/default/xui/tr/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/indra/newview/skins/default/xui/tr/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_people.xml b/indra/newview/skins/default/xui/tr/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_places.xml b/indra/newview/skins/default/xui/tr/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_post_process.xml b/indra/newview/skins/default/xui/tr/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences.xml b/indra/newview/skins/default/xui/tr/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_region_info.xml b/indra/newview/skins/default/xui/tr/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug.xml b/indra/newview/skins/default/xui/tr/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_script_limits.xml b/indra/newview/skins/default/xui/tr/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_script_preview.xml b/indra/newview/skins/default/xui/tr/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_script_queue.xml b/indra/newview/skins/default/xui/tr/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_script_search.xml b/indra/newview/skins/default/xui/tr/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_search.xml b/indra/newview/skins/default/xui/tr/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_select_key.xml b/indra/newview/skins/default/xui/tr/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_sell_land.xml b/indra/newview/skins/default/xui/tr/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_snapshot.xml b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_sys_well.xml b/indra/newview/skins/default/xui/tr/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_telehub.xml b/indra/newview/skins/default/xui/tr/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_top_objects.xml b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_toybox.xml b/indra/newview/skins/default/xui/tr/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_url_entry.xml b/indra/newview/skins/default/xui/tr/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_web_content.xml b/indra/newview/skins/default/xui/tr/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/floater_world_map.xml b/indra/newview/skins/default/xui/tr/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/inspect_avatar.xml b/indra/newview/skins/default/xui/tr/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/inspect_group.xml b/indra/newview/skins/default/xui/tr/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/inspect_object.xml b/indra/newview/skins/default/xui/tr/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_edit.xml b/indra/newview/skins/default/xui/tr/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_favorites.xml b/indra/newview/skins/default/xui/tr/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_group_plus.xml b/indra/newview/skins/default/xui/tr/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_landmark.xml b/indra/newview/skins/default/xui/tr/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_mini_map.xml b/indra/newview/skins/default/xui/tr/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_navbar.xml b/indra/newview/skins/default/xui/tr/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_list.xml b/indra/newview/skins/default/xui/tr/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_picks.xml b/indra/newview/skins/default/xui/tr/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_place.xml b/indra/newview/skins/default/xui/tr/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_slurl.xml b/indra/newview/skins/default/xui/tr/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_text_editor.xml b/indra/newview/skins/default/xui/tr/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_toolbars.xml b/indra/newview/skins/default/xui/tr/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_group.xml b/indra/newview/skins/default/xui/tr/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_http.xml b/indra/newview/skins/default/xui/tr/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_map.xml b/indra/newview/skins/default/xui/tr/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/mime_types.xml b/indra/newview/skins/default/xui/tr/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/mime_types_linux.xml b/indra/newview/skins/default/xui/tr/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/mime_types_mac.xml b/indra/newview/skins/default/xui/tr/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_chat_header.xml b/indra/newview/skins/default/xui/tr/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_classified_info.xml b/indra/newview/skins/default/xui/tr/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_notices.xml b/indra/newview/skins/default/xui/tr/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_notify.xml b/indra/newview/skins/default/xui/tr/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_instant_message.xml b/indra/newview/skins/default/xui/tr/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_landmarks.xml b/indra/newview/skins/default/xui/tr/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_pick_info.xml b/indra/newview/skins/default/xui/tr/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_picks.xml b/indra/newview/skins/default/xui/tr/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_place_profile.xml b/indra/newview/skins/default/xui/tr/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_places.xml b/indra/newview/skins/default/xui/tr/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_region_general.xml b/indra/newview/skins/default/xui/tr/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/panel_world_map.xml b/indra/newview/skins/default/xui/tr/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
old mode 100644
new mode 100755
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From adcf2d98e39bc8cc4b480bcf8d88a037d9b4140d Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Sat, 30 Mar 2013 15:51:16 -0500
Subject: NORSPEC-72 Set default value of glossiness to 0.2

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 8382ad69d1..e156b3e07c 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -394,7 +394,7 @@
              max_value="1"
              follows="left|top"
              height="19"
-             initial_value="0"
+             initial_value="0.2"
              layout="topleft"
              top_delta="-4"
              left_pad="10"
-- 
cgit v1.2.3


From cb4ec925823fdfe09504c78a7d7a96228a4b6219 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 1 Apr 2013 13:04:24 -0700
Subject: CHUI-907 : Prevent warning when parsing menus adding name to
 menu_item_check

---
 indra/newview/skins/default/xui/en/menu_login.xml  | 15 ++++++++++-----
 indra/newview/skins/default/xui/en/menu_viewer.xml |  4 ++++
 2 files changed, 14 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 101e104eab..52c4fb1613 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -180,7 +180,8 @@
        name="Set Logging Level"
        tear_off="true">
         <menu_item_check
-          label="Debug">
+         name="Debug"
+         label="Debug">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="0" />
@@ -189,7 +190,8 @@
            parameter="0" />
         </menu_item_check>
         <menu_item_check
-          label="Info">
+         name="Info"
+         label="Info">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="1" />
@@ -198,7 +200,8 @@
            parameter="1" />
         </menu_item_check>
         <menu_item_check
-          label="Warning">
+         name="Warning"
+         label="Warning">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="2" />
@@ -207,7 +210,8 @@
            parameter="2" />
         </menu_item_check>
         <menu_item_check
-          label="Error">
+         name="Error"
+         label="Error">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="3" />
@@ -216,7 +220,8 @@
            parameter="3" />
         </menu_item_check>
         <menu_item_check
-          label="None">
+         name="None"
+         label="None">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="4" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 544f06ac0c..67d8e3eaa4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -131,6 +131,7 @@
        name="Status"
        tear_off="true">
         <menu_item_check
+         name="Away"
          label="Away">
           <menu_item_check.on_check
            function="View.Status.CheckAway" />
@@ -138,6 +139,7 @@
            function="World.SetAway" />
         </menu_item_check>
         <menu_item_check
+         name="Do Not Disturb"
          label="Do Not Disturb">
           <menu_item_check.on_check
            function="View.Status.CheckDoNotDisturb" />
@@ -257,6 +259,7 @@
              parameter="speak" />
         </menu_item_check>
         <menu_item_check
+         name="Conversation Log..."
          label="Conversation Log...">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -352,6 +355,7 @@
         </menu_item_call>
       <menu_item_separator/>
       <menu_item_check
+       name="Do Not Disturb"
        label="Do Not Disturb">
         <menu_item_check.on_check
          function="View.Status.CheckDoNotDisturb" />
-- 
cgit v1.2.3


From c588f6be31a203f05fbd784b0270555c6e1d04d6 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 1 Apr 2013 13:39:14 -0700
Subject: CHUI-907 : Fixed! Suppress inexistant menu item and duplicated
 registrar entry to avoid warning

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 -------
 1 file changed, 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 67d8e3eaa4..a11cd13fdb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3055,13 +3055,6 @@
                 <menu_item_call.on_click
                  function="Advanced.PrintAgentInfo" />
             </menu_item_call>
-            <menu_item_call
-             label="Memory Stats"
-             name="Memory Stats"
-             shortcut="control|alt|shift|M">
-                <menu_item_call.on_click
-                 function="Advanced.PrintTextureMemoryStats" />
-            </menu_item_call>
             <menu_item_check
              label="Region Debug Console"
              name="Region Debug Console"
-- 
cgit v1.2.3


From f61f5d1c10ee5bb493355ce9a96beb455199e8b3 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 1 Apr 2013 16:28:28 -0400
Subject: fix typo: Advance -> Advanced

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

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

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 545bd94ddd..708dcf4e95 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -262,7 +262,7 @@
 		 control_name="RenderDeferred"
 		 height="16"
 		 initial_value="true"
-		 label="Advance Lighting Model"
+		 label="Advanced Lighting Model"
 		 layout="topleft"
 		 left_delta="0"
 		 name="UseLightShaders"
-- 
cgit v1.2.3


From 3f1ad7dbd017b43876ac5f9356ed6913157ddbaa Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 2 Apr 2013 18:56:52 +0300
Subject: CHUI-811 FIXED [CHUIBUG]Too much spacing around the new chat UI
 elements

---
 .../skins/default/xui/en/floater_im_session.xml    | 62 ++++++++++++++--------
 1 file changed, 40 insertions(+), 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 3b56e974d2..2152a9f6e9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -70,23 +70,26 @@
      top="0"
      left="0"
      right="-1"
-     bottom="-1">
+     bottom="-3">
         <layout_stack
          animate="false" 
          default_tab_group="2"
          follows="all"
          right="-5"
          bottom="-1"
+         top="0"
+         left="5"
+         border_size="0"
          layout="topleft"
          orientation="vertical"
          name="main_stack"
-         tab_group="1"
-         top="0"
-         left="5">
+         tab_group="1">
             <layout_panel
              auto_resize="false"
              name="toolbar_panel"
-             height="35">
+             height="35"
+             right="-1"
+             left="1">
                 <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
@@ -164,7 +167,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 right="-70"
+                 right="-67"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
@@ -196,7 +199,8 @@
             </layout_panel>
             <layout_panel
              name="body_panel"
-             height="235">
+             top="1"
+             bottom="-1">
                 <layout_stack
                  default_tab_group="2"
                  follows="all"
@@ -213,12 +217,14 @@
                      min_dim="0"
                      width="150" 
                      user_resize="true"
-                     auto_resize="false" />
+                     auto_resize="false" 
+                     bottom="-1" />
                     <layout_panel
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="221">
+                     min_width="221"
+                     bottom="-1">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
@@ -262,21 +268,28 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             height="35"
+             top_delta="0"
+             top="0"
+             height="26"
+             bottom="-1"
              auto_resize="false"
              name="chat_layout_panel">
                 <layout_stack
                  animate="false"
                  default_tab_group="2"
                  follows="all"
-                 right="-1"
                  orientation="horizontal"
                  name="input_panels"
                  top="0"
-                 bottom="-1"
-                 left="0">
+                 bottom="-2"
+                 left="0"
+                 right="-1">
                     <layout_panel
-                     name="input_editor_layout_panel">
+                     name="input_editor_layout_panel"
+                     auto_resize="true"
+                     user_resize="false"
+                     top="0"
+                     bottom="-1">
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -289,27 +302,32 @@
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         bottom="-8"
-                         left="5"
-                         right="-5"
+                         top="1"
+                         bottom="-2"
+                         left="4"
+                         right="-4"
                          wrap="true" />
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
+                     user_resize="false"
                      name="input_button_layout_panel"
-                     width="32">
+                     width="30"
+                     top="0"
+                     bottom="-1">
                         <button
+                         layout="topleft"
                          left="1"
-                         top="4"
+                         right="-1"
+                         top="1"
+                         height="22"
                          follows="left|right|top"
-                         height="25"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_overlay="Conv_expand_one_line"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
                          name="minz_btn"
-                         tool_tip="Shows/hides message panel"
-                         width="28" />
+                         tool_tip="Shows/hides message panel" />
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
-- 
cgit v1.2.3


From e21a0f09b3bf6dfe592c3667e40dd80295bca251 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 3 Apr 2013 13:50:50 +0300
Subject: CHUI-911 FIXED [CHUIBUG]When Chat side of Conversations floater is
 reduced to it's minimum width the scroll bar is half-obscured.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 2152a9f6e9..08ecc37d21 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -78,7 +78,7 @@
          right="-5"
          bottom="-1"
          top="0"
-         left="5"
+         left="3"
          border_size="0"
          layout="topleft"
          orientation="vertical"
@@ -86,6 +86,7 @@
          tab_group="1">
             <layout_panel
              auto_resize="false"
+             user_resize="false"
              name="toolbar_panel"
              height="35"
              right="-1"
@@ -200,7 +201,9 @@
             <layout_panel
              name="body_panel"
              top="1"
-             bottom="-1">
+             bottom="-1"
+             auto_resize="true"
+             user_resize="false">
                 <layout_stack
                  default_tab_group="2"
                  follows="all"
@@ -273,6 +276,7 @@
              height="26"
              bottom="-1"
              auto_resize="false"
+             user_resize="false"
              name="chat_layout_panel">
                 <layout_stack
                  animate="false"
-- 
cgit v1.2.3


From 2d7a09839ea75bf8b87220f5585e5d6fd2a11d72 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 3 Apr 2013 20:39:35 +0300
Subject: CHUI-841 FIXED No warning given that you cannot leave a group you are
 the last owner of in conversation floater and people floater Added check in
 LLGroupActions::leave() method for number of members in the group and whether
 avatar is the owner. Also added LLFetchGroupMemberData class which sends and
 handles async request for group member data and used in the above method.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 105bef7321..49e2ddfb14 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3648,6 +3648,17 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="OwnerCannotLeaveGroup"
+   type="alertmodal">
+    Unable to leave group. You cannot leave the group because you are the last owner of the group. Please assign another member to the owner role first.
+    <tag>group</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alert.tga"
    name="ConfirmKick"
-- 
cgit v1.2.3


From 3730e633fcace2173181786b08b601399e9307b6 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 3 Apr 2013 14:20:11 -0700
Subject: sync with viewer-development

---
 .../skins/default/xui/en/floater_im_session.xml    | 441 +++++++++------------
 .../newview/skins/default/xui/en/notifications.xml |   2 +-
 2 files changed, 180 insertions(+), 263 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d8b085063f..3b56e974d2 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -42,58 +42,52 @@
     <floater.string
      name="multiple_participants_added"
      value="[NAME] were invited to the conversation."/>
-     <floater.string
+    <floater.string
      name="tooltip_to_separate_window"
      value="Move this conversation to a separate window"/>
-     <floater.string
+    <floater.string
      name="tooltip_to_main_window"
      value="Move this conversation back to main window"/>
-  <floater.string
+    <floater.string
      name="start_call_button_tooltip"
      value="Open voice connection"/>
-  <floater.string
+    <floater.string
      name="end_call_button_tooltip"
      value="Close voice connection"/>
-   <floater.string
+    <floater.string
      name="expcol_button_not_tearoff_tooltip"
      value="Collapse this pane"/>
-   <floater.string
+    <floater.string
      name="expcol_button_tearoff_and_expanded_tooltip"
      value="Collapse participant list"/>
-   <floater.string
+    <floater.string
      name="expcol_button_tearoff_and_collapsed_tooltip"
      value="Expand participant list"/>
     <view
-        follows="all"
-        layout="topleft"
-        name="contents_view"
-        top="0"
-        left="0"
-        height="355"
-        width="394">
-   <layout_stack
-   animate="false" 
-   default_tab_group="2"
-   follows="all"
-  height="355"
-  width="394"
-  layout="topleft"
-  orientation="vertical"
-   name="main_stack"
-  tab_group="1"
-  top="0"
-  left="0">
-  
-     <layout_panel
-         follows="left|top|right"
+     follows="all"
+     layout="topleft"
+     name="contents_view"
+     top="0"
+     left="0"
+     right="-1"
+     bottom="-1">
+        <layout_stack
+         animate="false" 
+         default_tab_group="2"
+         follows="all"
+         right="-5"
+         bottom="-1"
          layout="topleft"
-         name="toolbar_panel"
+         orientation="vertical"
+         name="main_stack"
+         tab_group="1"
          top="0"
-         left="0"
-         height="35"
-         min_height="35"
-         width="394">         
-             <menu_button
+         left="5">
+            <layout_panel
+             auto_resize="false"
+             name="toolbar_panel"
+             height="35">
+                <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
                  height="25"
@@ -107,22 +101,22 @@
                  tool_tip="View/sort options"
                  top="5"
                  width="31" />
-             <menu_button
-				 menu_filename="menu_im_conversation.xml"
-				 follows="top|left"
-				 height="25"
-				 image_hover_unselected="Toolbar_Middle_Over"
-				 image_overlay="OptionsMenu_Off"
-				 image_selected="Toolbar_Middle_Selected"
-				 image_unselected="Toolbar_Middle_Off"
-				 layout="topleft"
-			 	 top="5"
-			 	 left_pad="2"
-				 name="gear_btn"
-				 visible="false"
-				 tool_tip="Actions on selected person"
-				 width="31"/>
-             <button
+                <menu_button
+                 menu_filename="menu_im_conversation.xml"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="5"
+                 left_pad="2"
+                 name="gear_btn"
+                 visible="false"
+                 tool_tip="Actions on selected person"
+                 width="31"/>
+                <button
                  enabled="false"
                  follows="top|left"
                  height="25"
@@ -136,7 +130,7 @@
                  name="add_btn"
                  tool_tip="Add someone to this conversation"
                  width="31"/>
-             <button
+                <button
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -149,19 +143,19 @@
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
                  width="31"/>
-              <output_monitor
-                  auto_update="true"
-                  follows="top|left"
-                  draw_border="false"
-                  height="16"
-                  layout="topleft"
-                  top="10"
-                  left_pad="10"
-                  mouse_opaque="true"
-                  name="speaking_indicator"
-                  visible="false"
-                  width="20" />       
-             <button
+                <output_monitor
+                 auto_update="true"
+                 follows="top|left"
+                 draw_border="false"
+                 height="16"
+                 layout="topleft"
+                 top="10"
+                 left_pad="10"
+                 mouse_opaque="true"
+                 name="speaking_indicator"
+                 visible="false"
+                 width="20" />
+                <button
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
@@ -170,232 +164,155 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 left="292"
+                 right="-70"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
-             <button
+                <button
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="Conv_toolbar_collapse"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
                  left_pad="2"
                  name="expand_collapse_btn"
                  tool_tip="Collapse/Expand this pane"
                  width="31" />
-             <button
+                <button
                  follows="right|top"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="Conv_toolbar_arrow_ne"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
                  left_pad="2"
                  name="tear_off_btn"
+                 top="5"
                  width="31" />
-     </layout_panel>
-     <layout_panel
-      name="body_panel"
-      follows="all"
-      width="394" 
-      height="235" 
-      user_resize="false"
-      auto_resize="true">
-  <layout_stack
-   animate="true" 
-   default_tab_group="2"
-  follows="all"
-  height="275"
-  width="394"
-  layout="topleft"
-  orientation="horizontal"
-  name="im_panels"
-  tab_group="1"
-  top_pad="0"
-  left="0">
-    <layout_panel
-      name="speakers_list_panel"
-      follows="all"
-      expanded_min_dim="115"
-      min_dim="0"
-      width="150" 
-      height="275"
-      user_resize="true"
-      auto_resize="false">
-      </layout_panel>
-    <layout_panel
-       default_tab_group="3"
-       left="0"
-       tab_group="2"
-       follows="all"
-       top="0"
-       height="275"
-	   width="244"
-       layout="topleft"
-       user_resize="true"
-       auto_resize="true"
-       visible="true"
-       name="right_part_holder"
-       min_width="221">
-        <panel
-         name="trnsAndChat_panel"
-         follows="all"
-         layout="topleft"
-         visible="true"
-         height="240"
-         width="244">
-         <layout_stack
-          animate="true" 
-          default_tab_group="2"
-          follows="all"
-          height="240"
-          width="244"
-          layout="topleft"
-          visible="true"
-          orientation="vertical"
-          name="translate_and_chat_stack"
-          tab_group="1"
-          left_pad="0"
-          top="0"
-          left="0">
-            <layout_panel
-             auto_resize="false"
-             user_resize="false"
-             height="26"
-             layout="topleft"
-             left_delta="0"
-             name="translate_chat_checkbox_lp"
-             top_delta="0"
-             visible="true"
-             width="210">
-                <check_box
-                 top="10"
-                 control_name="TranslateChat"
-                 enabled="true"
-                 height="16"
-                 label="Translate chat"
-                 layout="topleft"
-                 left="5"
-                 name="translate_chat_checkbox"
-                 width="230" />
             </layout_panel>
             <layout_panel
-             width="210"
-             layout="topleft"
-             follows="all"
-             left_delta="0"
-             top_delta="0"
-             bottom="0"
-             visible="true"
-             user_resize="false"
-             auto_resize="true"
-             name="chat_holder">      
-               <chat_history
-                font="SansSerifSmall"
-                follows="all"
-                visible="true"
-                name="chat_history"
-                parse_highlights="true"
-                parse_urls="true"
-                layout="topleft"
-                right="-5"
-                left="5"
-                top="0"
-                bottom="1">
-               </chat_history>
+             name="body_panel"
+             height="235">
+                <layout_stack
+                 default_tab_group="2"
+                 follows="all"
+                 orientation="horizontal"
+                 name="im_panels"
+                 tab_group="1"
+                 top="0"
+                 right="-1"
+                 bottom="-1"
+                 left="0">
+                    <layout_panel
+                     name="speakers_list_panel"
+                     expanded_min_dim="115"
+                     min_dim="0"
+                     width="150" 
+                     user_resize="true"
+                     auto_resize="false" />
+                    <layout_panel
+                     default_tab_group="3"
+                     tab_group="2"
+                     name="right_part_holder"
+                     min_width="221">
+                        <layout_stack
+                         animate="true" 
+                         default_tab_group="2"
+                         follows="all"
+                         orientation="vertical"
+                         name="translate_and_chat_stack"
+                         tab_group="1"
+                         top="0"
+                         left="0"
+                         right="-1"
+                         bottom="-1">
+                            <layout_panel
+                             auto_resize="false"
+                             height="26"
+                             name="translate_chat_checkbox_lp">
+                                <check_box
+                                 top="10"
+                                 control_name="TranslateChat"
+                                 enabled="true"
+                                 height="16"
+                                 label="Translate chat"
+                                 left="5"
+                                 name="translate_chat_checkbox"
+                                 width="230" />
+                            </layout_panel>
+                            <layout_panel
+                             name="chat_holder">
+                                <chat_history
+                                 font="SansSerifSmall"
+                                 follows="all"
+                                 name="chat_history"
+                                 parse_highlights="true"
+                                 parse_urls="true"
+                                 right="-1"
+                                 left="5"
+                                 top="0"
+                                 bottom="-1" />
+                            </layout_panel>
+                        </layout_stack>
+                    </layout_panel>
+                </layout_stack>
             </layout_panel>
-           </layout_stack>
-           </panel>
-    </layout_panel>
-  </layout_stack>
-  </layout_panel>
-  <layout_panel
+            <layout_panel
              height="35"
-             layout="topleft"
-             follows="left|right|bottom"
-             left_delta="0"
-             right="0"
-             top_delta="0"
-             bottom="0"
-             visible="true"
-             user_resize="false"
              auto_resize="false"
              name="chat_layout_panel">
-   <layout_stack
-   animate="true" 
-   default_tab_group="2"
-   follows="all"
-   height="35"
-   right="0"
-   layout="topleft"
-   orientation="horizontal"
-   name="input_panels"
-   top_pad="0"
-   left="0">
-     <layout_panel
-             height="35"
-             layout="topleft"
-             follows="left|right|bottom"
-             left_delta="0"
-             top_delta="0"
-             bottom="0"
-             visible="true"
-             user_resize="false"
-             auto_resize="true"
-             name="input_editor_layout_panel">
-              <chat_editor
-             expand_lines_count="5"
-             follows="left|right|bottom"
-               font="SansSerifSmall"
-             visible="true"
-             height="20"
-             is_expandable="true"
-             label="To"
-             text_tentative_color="TextFgTentativeColor"
-             layout="topleft"
-             name="chat_editor"
-             max_length="1023"
-             spellcheck="true"
-             tab_group="3"
-             width="160"
-             top="6"
-             left="5"
-             right="-5"
-             wrap="true">
-            </chat_editor>
+                <layout_stack
+                 animate="false"
+                 default_tab_group="2"
+                 follows="all"
+                 right="-1"
+                 orientation="horizontal"
+                 name="input_panels"
+                 top="0"
+                 bottom="-1"
+                 left="0">
+                    <layout_panel
+                     name="input_editor_layout_panel">
+                        <chat_editor
+                         layout="topleft"
+                         expand_lines_count="5"
+                         follows="left|right|bottom"
+                         font="SansSerifSmall"
+                         height="20"    
+                         is_expandable="true"
+                         text_tentative_color="TextFgTentativeColor"
+                         name="chat_editor"
+                         max_length="1023"
+                         spellcheck="true"
+                         tab_group="3"
+                         bottom="-8"
+                         left="5"
+                         right="-5"
+                         wrap="true" />
+                    </layout_panel>
+                    <layout_panel
+                     auto_resize="false"
+                     name="input_button_layout_panel"
+                     width="32">
+                        <button
+                         left="1"
+                         top="4"
+                         follows="left|right|top"
+                         height="25"
+                         image_hover_unselected="Toolbar_Middle_Over"
+                         image_overlay="Conv_expand_one_line"
+                         image_selected="Toolbar_Middle_Selected"
+                         image_unselected="Toolbar_Middle_Off"
+                         name="minz_btn"
+                         tool_tip="Shows/hides message panel"
+                         width="28" />
+                    </layout_panel>
+                </layout_stack>
             </layout_panel>
-            <layout_panel             
-             height="35"
-             layout="topleft"
-             follows="left|right|bottom"
-             left_delta="0"
-             top_delta="0"
-             bottom="0"
-             width="35"
-             visible="true"
-             user_resize="false"
-             auto_resize="false"
-             name="input_button_layout_panel">
-            <button
-                 follows="left|right|bottom"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Conv_expand_one_line"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 name="minz_btn"
-                 tool_tip="Shows/hides message panel"
-                 width="28"/>
-           </layout_panel>
-  </layout_stack>
-  </layout_panel>
-  </layout_stack>
+        </layout_stack>
     </view>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c681e39002..105bef7321 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -352,7 +352,7 @@ Save all changes to clothing/body parts?
    icon="alertmodal.tga"
    name="FriendsAndGroupsOnly"
    type="alertmodal">
-    Non-friends won't know that you've choosen to ignore their calls and instant messages.
+    Non-friends won't know that you've chosen to ignore their calls and instant messages.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
-- 
cgit v1.2.3


From 7a820b88fc45a4a16573387782e1c3f7e412da68 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 3 Apr 2013 16:56:59 -0500
Subject: NORSPEC-71 Lots more UI hookups

Written with and Reviewed By Graham
---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index e156b3e07c..5e2caa28a9 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -209,9 +209,11 @@
              layout="topleft"
              top_pad="4"
              left_delta="0"
+             increment="1"
              name="maskcutoff"
              width="80" />
             <texture_picker
+             allow_no_texture="true"
              can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="locked_image.j2c"
@@ -322,6 +324,7 @@
                  value="Use texture" />
             </combo_box>
             <texture_picker
+             allow_no_texture="true"
              can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="locked_image.j2c"
-- 
cgit v1.2.3


From 9f56dad9582c8585a92c54baf28c928b2d3bb7d2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 3 Apr 2013 15:35:45 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 and other projects

---
 .../default/xui/de/floater_conversation_log.xml    |   8 +
 .../xui/de/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/de/floater_im_container.xml  |  29 +-
 .../skins/default/xui/de/floater_im_session.xml    |  61 +-
 .../skins/default/xui/de/floater_incoming_call.xml |  10 +-
 .../default/xui/de/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/de/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/de/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/de/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/de/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/de/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/de/menu_conversation.xml     |  31 +
 .../default/xui/de/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/de/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/de/menu_im_conversation.xml  |  15 +
 .../default/xui/de/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/de/menu_object_icon.xml      |   2 +
 .../skins/default/xui/de/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/de/menu_participant_view.xml |  13 +
 .../default/xui/de/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/de/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/de/menu_people_blocked_view.xml    |   5 +
 .../default/xui/de/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/de/menu_people_groups.xml    |   2 +-
 .../default/xui/de/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/de/menu_people_nearby.xml    |  23 +-
 .../xui/de/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/de/menu_people_nearby_view.xml     |   8 +
 .../default/xui/de/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/de/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/de/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/de/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/de/panel_avatar_list_item.xml      |   1 +
 .../default/xui/de/panel_block_list_sidetray.xml   |  15 +-
 .../xui/de/panel_conversation_list_item.xml        |   8 +
 .../xui/de/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/de/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/de/panel_people.xml  |  88 +--
 .../default/xui/de/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/de/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/de/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/de/strings.xml     |  68 +-
 .../default/xui/es/floater_conversation_log.xml    |   8 +
 .../xui/es/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/es/floater_im_container.xml  |  29 +-
 .../skins/default/xui/es/floater_im_session.xml    |  61 +-
 .../skins/default/xui/es/floater_incoming_call.xml |  10 +-
 .../default/xui/es/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/es/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/es/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/es/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/es/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/es/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/es/menu_conversation.xml     |  31 +
 .../default/xui/es/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/es/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/es/menu_im_conversation.xml  |  15 +
 .../default/xui/es/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/es/menu_object_icon.xml      |   2 +
 .../skins/default/xui/es/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/es/menu_participant_view.xml |  13 +
 .../default/xui/es/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/es/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/es/menu_people_blocked_view.xml    |   5 +
 .../default/xui/es/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/es/menu_people_groups.xml    |   2 +-
 .../default/xui/es/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/es/menu_people_nearby.xml    |  23 +-
 .../xui/es/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/es/menu_people_nearby_view.xml     |   8 +
 .../default/xui/es/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/es/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/es/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml |  35 +-
 .../newview/skins/default/xui/es/notifications.xml | 692 ++++++++++++++++++++-
 .../default/xui/es/panel_avatar_list_item.xml      |   1 +
 .../default/xui/es/panel_block_list_sidetray.xml   |  15 +-
 .../xui/es/panel_conversation_list_item.xml        |   8 +
 .../xui/es/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/es/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/es/panel_people.xml  |  88 +--
 .../default/xui/es/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/es/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/es/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/es/strings.xml     |  63 +-
 .../default/xui/fr/floater_conversation_log.xml    |   8 +
 .../xui/fr/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/fr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/fr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/fr/floater_incoming_call.xml |  10 +-
 .../default/xui/fr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/fr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/fr/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/fr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/fr/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/fr/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/fr/menu_conversation.xml     |  31 +
 .../default/xui/fr/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/fr/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/fr/menu_im_conversation.xml  |  15 +
 .../default/xui/fr/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/fr/menu_object_icon.xml      |   2 +
 .../skins/default/xui/fr/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/fr/menu_participant_view.xml |  13 +
 .../default/xui/fr/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/fr/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/fr/menu_people_blocked_view.xml    |   5 +
 .../default/xui/fr/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/fr/menu_people_groups.xml    |   2 +-
 .../default/xui/fr/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/fr/menu_people_nearby.xml    |  23 +-
 .../xui/fr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/fr/menu_people_nearby_view.xml     |   8 +
 .../default/xui/fr/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/fr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/fr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/fr/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/fr/panel_avatar_list_item.xml      |   1 +
 .../default/xui/fr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/fr/panel_conversation_list_item.xml        |   8 +
 .../xui/fr/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/fr/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/fr/panel_people.xml  |  88 +--
 .../default/xui/fr/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/fr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/fr/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/fr/strings.xml     |  68 +-
 .../default/xui/it/floater_conversation_log.xml    |   8 +
 .../xui/it/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/it/floater_im_container.xml  |  29 +-
 .../skins/default/xui/it/floater_im_session.xml    |  61 +-
 .../skins/default/xui/it/floater_incoming_call.xml |  10 +-
 .../default/xui/it/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/it/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/it/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/it/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/it/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/it/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/it/menu_conversation.xml     |  31 +
 .../default/xui/it/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/it/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/it/menu_im_conversation.xml  |  15 +
 .../default/xui/it/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/it/menu_object_icon.xml      |   2 +
 .../skins/default/xui/it/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/it/menu_participant_view.xml |  13 +
 .../default/xui/it/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/it/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/it/menu_people_blocked_view.xml    |   5 +
 .../default/xui/it/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/it/menu_people_groups.xml    |   2 +-
 .../default/xui/it/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/it/menu_people_nearby.xml    |  23 +-
 .../xui/it/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/it/menu_people_nearby_view.xml     |   8 +
 .../default/xui/it/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/it/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/it/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/it/notifications.xml | 692 ++++++++++++++++++++-
 .../default/xui/it/panel_avatar_list_item.xml      |   1 +
 .../default/xui/it/panel_block_list_sidetray.xml   |  15 +-
 .../xui/it/panel_conversation_list_item.xml        |   8 +
 .../xui/it/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/it/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/it/panel_people.xml  |  88 +--
 .../default/xui/it/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/it/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/it/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/it/strings.xml     |  63 +-
 .../default/xui/ja/floater_conversation_log.xml    |   8 +
 .../xui/ja/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/ja/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ja/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |  10 +-
 .../default/xui/ja/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/ja/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |  31 +
 .../default/xui/ja/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/ja/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/ja/menu_im_conversation.xml  |  15 +
 .../default/xui/ja/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/ja/menu_object_icon.xml      |   2 +
 .../skins/default/xui/ja/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/ja/menu_participant_view.xml |  13 +
 .../default/xui/ja/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/ja/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/ja/menu_people_blocked_view.xml    |   5 +
 .../default/xui/ja/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/ja/menu_people_groups.xml    |   2 +-
 .../default/xui/ja/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/ja/menu_people_nearby.xml    |  23 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |   8 +
 .../default/xui/ja/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/ja/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/ja/notifications.xml | 686 +++++++++++++++++++-
 .../default/xui/ja/panel_avatar_list_item.xml      |   1 +
 .../default/xui/ja/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ja/panel_conversation_list_item.xml        |   8 +
 .../xui/ja/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/ja/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/ja/panel_people.xml  |  90 +--
 .../default/xui/ja/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/ja/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/ja/strings.xml     |  68 +-
 .../default/xui/pt/floater_conversation_log.xml    |   8 +
 .../xui/pt/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/pt/floater_im_container.xml  |  29 +-
 .../skins/default/xui/pt/floater_im_session.xml    |  61 +-
 .../skins/default/xui/pt/floater_incoming_call.xml |   8 +-
 .../default/xui/pt/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/pt/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/pt/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/pt/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/pt/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/pt/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/pt/menu_conversation.xml     |  31 +
 .../default/xui/pt/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/pt/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/pt/menu_im_conversation.xml  |  15 +
 .../default/xui/pt/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/pt/menu_object_icon.xml      |   2 +
 .../skins/default/xui/pt/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/pt/menu_participant_view.xml |  13 +
 .../default/xui/pt/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/pt/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/pt/menu_people_blocked_view.xml    |   5 +
 .../default/xui/pt/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/pt/menu_people_groups.xml    |   2 +-
 .../default/xui/pt/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/pt/menu_people_nearby.xml    |  23 +-
 .../xui/pt/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/pt/menu_people_nearby_view.xml     |   8 +
 .../default/xui/pt/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/pt/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/pt/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/pt/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/pt/panel_avatar_list_item.xml      |   1 +
 .../default/xui/pt/panel_block_list_sidetray.xml   |  15 +-
 .../xui/pt/panel_conversation_list_item.xml        |   8 +
 .../xui/pt/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/pt/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/pt/panel_people.xml  |  88 +--
 .../default/xui/pt/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/pt/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/pt/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/pt/strings.xml     |  63 +-
 .../default/xui/ru/floater_conversation_log.xml    |   8 +
 .../xui/ru/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/ru/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ru/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ru/floater_incoming_call.xml |  10 +-
 .../default/xui/ru/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ru/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ru/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/ru/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ru/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/ru/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/ru/menu_conversation.xml     |  31 +
 .../default/xui/ru/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/ru/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/ru/menu_im_conversation.xml  |  15 +
 .../default/xui/ru/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/ru/menu_object_icon.xml      |   2 +
 .../skins/default/xui/ru/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/ru/menu_participant_view.xml |  13 +
 .../default/xui/ru/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/ru/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/ru/menu_people_blocked_view.xml    |   5 +
 .../default/xui/ru/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/ru/menu_people_groups.xml    |   2 +-
 .../default/xui/ru/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/ru/menu_people_nearby.xml    |  23 +-
 .../xui/ru/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ru/menu_people_nearby_view.xml     |   8 +
 .../default/xui/ru/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/ru/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ru/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/ru/notifications.xml | 689 +++++++++++++++++++-
 .../default/xui/ru/panel_avatar_list_item.xml      |   1 +
 .../default/xui/ru/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ru/panel_conversation_list_item.xml        |   8 +
 .../xui/ru/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/ru/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/ru/panel_people.xml  |  88 +--
 .../default/xui/ru/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/ru/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ru/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/ru/strings.xml     |  66 +-
 .../default/xui/tr/floater_conversation_log.xml    |   8 +
 .../xui/tr/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/tr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/tr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/tr/floater_incoming_call.xml |  10 +-
 .../default/xui/tr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/tr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/tr/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/tr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/tr/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/tr/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/tr/menu_conversation.xml     |  31 +
 .../default/xui/tr/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/tr/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/tr/menu_im_conversation.xml  |  15 +
 .../default/xui/tr/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/tr/menu_object_icon.xml      |   2 +
 .../skins/default/xui/tr/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/tr/menu_participant_view.xml |  13 +
 .../default/xui/tr/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/tr/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/tr/menu_people_blocked_view.xml    |   5 +
 .../default/xui/tr/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/tr/menu_people_groups.xml    |   2 +-
 .../default/xui/tr/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/tr/menu_people_nearby.xml    |  23 +-
 .../xui/tr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/tr/menu_people_nearby_view.xml     |   8 +
 .../default/xui/tr/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/tr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/tr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/tr/notifications.xml | 683 +++++++++++++++++++-
 .../default/xui/tr/panel_avatar_list_item.xml      |   1 +
 .../default/xui/tr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/tr/panel_conversation_list_item.xml        |   8 +
 .../xui/tr/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/tr/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/tr/panel_people.xml  |  88 +--
 .../default/xui/tr/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/tr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/tr/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/tr/strings.xml     |  68 +-
 .../default/xui/zh/floater_conversation_log.xml    |   8 +
 .../xui/zh/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/zh/floater_im_container.xml  |  29 +-
 .../skins/default/xui/zh/floater_im_session.xml    |  61 +-
 .../skins/default/xui/zh/floater_incoming_call.xml |   8 +-
 .../default/xui/zh/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/zh/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/zh/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/zh/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/zh/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/zh/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/zh/menu_conversation.xml     |  31 +
 .../default/xui/zh/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/zh/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/zh/menu_im_conversation.xml  |  15 +
 .../default/xui/zh/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/zh/menu_object_icon.xml      |   2 +
 .../skins/default/xui/zh/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/zh/menu_participant_view.xml |  13 +
 .../default/xui/zh/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/zh/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/zh/menu_people_blocked_view.xml    |   5 +
 .../default/xui/zh/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/zh/menu_people_groups.xml    |   2 +-
 .../default/xui/zh/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/zh/menu_people_nearby.xml    |  23 +-
 .../xui/zh/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/zh/menu_people_nearby_view.xml     |   8 +
 .../default/xui/zh/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/zh/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/zh/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/zh/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/zh/panel_avatar_list_item.xml      |   1 +
 .../default/xui/zh/panel_block_list_sidetray.xml   |  15 +-
 .../xui/zh/panel_conversation_list_item.xml        |   8 +
 .../xui/zh/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/zh/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/zh/panel_people.xml  |  88 +--
 .../default/xui/zh/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/zh/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/zh/strings.xml     |  66 +-
 387 files changed, 10359 insertions(+), 1715 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
new file mode 100644
index 0000000000..19620a0fc9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL">
+	<panel name="buttons_panel">
+		<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
new file mode 100644
index 0000000000..010ad19076
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="UNTERHALTUNG:">
+	<floater.string name="Title">
+		UNTERHALTUNG: [NAME]
+	</floater.string>
+	<text name="page_label" value="Seite"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 95eda97938..5bf916c8e9 100644
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="GESPRÄCHE"/>
+<multi_floater name="floater_im_box" title="GESPRÄCHE">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+					<button name="add_btn" tool_tip="Neue Unterhaltung starten"/>
+					<button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/>
+					<text name="stub_textbox">
+						Diese Unterhaltung erscheint in einem separaten Fenster.   [secondlife:/// Zurückholen.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index abaf275651..f96eb72cb1 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="An" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/>
+	<floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/>
+	<floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/>
+	<floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/>
+	<floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/>
+	<floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/>
+				<button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/>
+				<button name="close_btn" tool_tip="Diese Unterhaltung beenden"/>
+				<button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="An" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index 213d9f54f5..f13842f479 100644
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		Anonym
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ruft an.
+		ruft Sie an.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ist einem Voice-Konferenz-Chat beigetreten.
@@ -25,9 +25,9 @@
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
-		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
+		Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet.
 	</text>
-	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
-	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
-	<button label="IM starten" name="Start IM"/>
+	<button label="Annehmen" label_selected="Annehmen" name="Accept"/>
+	<button label="Ignorieren" label_selected="Ignorieren" name="Reject"/>
+	<button label="Stattdessen IM öffnen" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index ebf8f01632..88e9f53a4c 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Anzeigen:
 			</text>
-			<check_box label="Welt" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 9585622516..b794d879f0 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Leer" label_selected="Leer" name="Blank"/>
 	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Live-Vorschau" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vorschau deaktiviert"/>
 	<filter_editor label="Texturen filtern" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..15259639e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE">
+	<slider label="Voice-Chat" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 413a46525c..8d37950480 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE MORPHING">
+<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
new file mode 100644
index 0000000000..258627c94f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="LAUTSTÄRKE">
+	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
index 54b218d22f..2dd871b2ea 100644
--- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
-	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
new file mode 100644
index 0000000000..30d3ab79e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
+	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
+	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Voice ignorieren" name="block_unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+	<menu_item_call label="Gruppenprofil" name="group_profile"/>
+	<menu_item_call label="Gruppe aktivieren" name="activate_group"/>
+	<menu_item_call label="Gruppe verlassen" name="leave_group"/>
+	<context_menu label="Moderatoroptionen" name="Moderator Options">
+		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
+		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
+		<menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..2ef8762128
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Voice-Anruf..." name="Call"/>
+	<menu_item_call label="Chatverlauf öffnen..." name="Chat history"/>
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="Invite"/>
+	<menu_item_call label="Karte" name="Map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..ae3cc5bc97
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
+	<menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/>
+	<menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
new file mode 100644
index 0000000000..875524b19d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..48f62d29a1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Kompaktansicht" name="compact_view"/>
+	<menu_item_check label="Erweiterte Ansicht" name="expanded_view"/>
+	<menu_item_check label="Zeit anzeigen" name="IMShowTime"/>
+	<menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index 8b6c558416..f92fa0f82b 100644
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Objektprofil..." name="Object Profile"/>
 	<menu_item_call label="Ignorieren..." name="Block"/>
+	<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
+	<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index d56c93533c..0cf3c09882 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Neues Haar" name="New Hair"/>
 		<menu_item_call label="Neue Augen" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Alle Ordner erweitern" name="expand"/>
+	<menu_item_call label="Alle Ordner schließen" name="collapse"/>
 	<menu_item_call label="Outfit neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml
new file mode 100644
index 0000000000..6ceb9ac4c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/>
+	<menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/>
+	<menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/>
+	<menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/>
+	<menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/>
+	<menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/>
+	<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/>
+	<menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/>
+	<menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..f69a453e58
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Nicht mehr ignorieren" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..041fde139d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/>
+	<menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..1dae593ebe
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Typ sortieren" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
new file mode 100644
index 0000000000..da4890fe96
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
+	<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
index 76225ba241..a69c82d3d8 100644
--- a/indra/newview/skins/default/xui/de/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Info anzeigen" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Voice-Anruf" name="Call"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Verlassen" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
new file mode 100644
index 0000000000..20386bba56
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index 1db964357f..cdbb3ae917 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Karte" name="Map"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index b6e99edfe1..ba6578e2d1 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
-	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Anrufen" name="call"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..d38ec65037
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Karte anzeigen" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a116ad0bc1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach jüngsten sortieren" name="sort_most"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index 9a808088fb..c61ebb0eae 100644
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
+	<menu_item_call label="Profil anzeigen" name="show_agent"/>
+	<menu_item_call label="IM senden..." name="send_im"/>
+	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 90d3763d9c..77b7004e44 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
+	<menu_item_call label="Objektprofil..." name="show_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 845df1f050..2c9d9fa7f1 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status">
-			<menu_item_call label="Abwesend" name="Set Away"/>
-			<menu_item_call label="Beschäftigt" name="Set Busy"/>
-		</menu>
+		<menu label="Status" name="Status"/>
 		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
 		<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
 		<menu_item_call label="Kontoübersicht..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
+		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
-		<menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/>
-		<menu_item_check label="Voice-Morphing..." name="ShowVoice"/>
+		<menu label="Voice-Morphing" name="VoiceMorphing">
+			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
+			<menu_item_check label="Vorschau..." name="Preview"/>
+			<menu_item_call label="Abonnieren..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesten..." name="Gestures"/>
-		<menu_item_call label="Freunde" name="My Friends"/>
-		<menu_item_call label="Gruppen" name="My Groups"/>
-		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_check label="Freunde" name="My Friends"/>
+		<menu_item_check label="Gruppen" name="My Groups"/>
+		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
 	</menu>
 	<menu label="Welt" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Kaufen" name="Menu Object Buy"/>
 			<menu_item_call label="Nehmen" name="Menu Object Take"/>
 			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
-			<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Objekt zurückgeben" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
+		<menu_item_call label="Benutzerhandbuch" name="User’s guide"/>
+		<menu_item_call label="Knowledge Base" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Community-Foren" name="Community Forums"/>
+		<menu_item_call label="Support-Portal" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
@@ -385,9 +393,14 @@
 				<menu_item_call label="Weiblich testen" name="Test Female"/>
 				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Animationsgeschwindigkeit" name="Animation Speed">
+				<menu_item_call label="Alle Animationen 10 % schneller" name="All Animations 10 Faster"/>
+				<menu_item_call label="Alle Animationen 10 % langsamer" name="All Animations 10 Slower"/>
+				<menu_item_call label="Alle Animationsgeschwindigkeiten zurücksetzen" name="Reset All Animation Speed"/>
+				<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
 			<menu_item_check label="Animations-Info" name="Animation Info"/>
-			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
 			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
 			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
 			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 4b7a60b4eb..dc0d7dc6b4 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -523,6 +523,24 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://support.amd.com/de/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=de-de
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -1558,10 +1576,13 @@ Diese Gruppe verlassen?
 		Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Beschäftigt-Modus ist aktiviert.
-Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben.
-		<usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Nicht-stören-Modus ist aktiviert:  Sie erhalten keine Benachrichtigung über eingehende Kommunikation.
+
+- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen &gt; Allgemein).
+- Teleport-Angebote werden abgelehnt.
+- Voice-Anrufe werden abgelehnt.
+		<usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab.
@@ -2049,6 +2070,10 @@ Inventarobjekt(e) verschieben?
 		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt.  Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen.
+		<usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Wirklich beenden?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
@@ -2122,14 +2147,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
 			<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
-	<notification label="Beschäftigt-Modus-Warnung" name="BusyModePay">
-		Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
+	<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
+		Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
 
-Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
+Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/>
-			<button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/>
-			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
+			<ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/>
+			<button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/>
+			<button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2264,11 +2289,8 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 	<notification name="GroupNotice">
 		Betreff: [SUBJECT], Nachricht: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
@@ -2496,13 +2518,6 @@ Fliegen ist hier nicht möglich.
 	<notification name="DynamicPathfindingDisabled">
 		Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt. Um dieses Problem zu beheben, klicken Sie auf die Schaltfläche „Region neu formen“. Um weitere Informationen zu erhalten, klicken Sie auf „Hilfe“.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Hilfe" ignoretext="Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2765,7 +2780,7 @@ Ist das OK?
 	<notification name="ScriptQuestionCaution">
 		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
   
-Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
+Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
 			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
@@ -3346,4 +3361,633 @@ Versuch abgebrochen.
 		Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen?
 		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar eingefroren.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] hat Sie aufgetaut.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar aufgetaut.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Sie sind nicht mehr eingefroren und können sich frei bewegen.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Dieser Benutzer kann nicht eingefroren werden.
+	</notification>
+	<notification name="NowOwnObject">
+		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen.
+	</notification>
+	<notification name="SitFailCantMove">
+		Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Kommen Sie näher heran.  Sitzen auf Objekt nicht möglich, da
+es sich nicht in der gleichen Region befindet wie Sie.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Neues Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Ohne ausgewählte Hauptobjekte duplizieren.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Objekte können nicht dupliziert werden, da die Region voll ist.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Objekt kann nicht erstellt werden, da 
+die Parzelle voll ist.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Versuch zum Rezzen eines Objekts fehlgeschlagen.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Dieses Inventarobjekt ist auf der schwarzen Liste.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Landsuche blockiert.
+Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt.
+Warten Sie kurz und versuchen Sie es noch einmal.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sie sind gestorben und wurden nach Hause teleportiert
+	</notification>
+	<notification name="EjectComingSoon">
+		Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Sie können diese Region nicht betreten, da 
+der Server voll ist.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Erneutes Speichern im Inventar ist deaktiviert.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		„[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann.
+	</notification>
+	<notification name="NoModNoTaking">
+		Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="RezDestInternalError">
+		Interner Fehler: Unbekannter Zielttyp.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Löschen fehlgeschlagen, da Objekt nicht gefunden wurde
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Dieser Benutzer kann nicht hinausgeworfen werden.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="HomePositionSet">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar hinausgeworfen.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Physik für Keyframe-Objekte kann nicht aktiviert werden.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden.
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt.
+	</notification>
+	<notification name="UnableAddItem">
+		Objekt konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="UnableEditItem">
+		Kein Bearbeiten möglich.
+	</notification>
+	<notification name="NoPermToEdit">
+		Bearbeiten nicht gestattet.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Kopieren dieses Inventars nicht gestattet.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
+	</notification>
+	<notification name="TooManyScripts">
+		Zu viele Skripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Skript konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Asset-Server hat nicht rechtzeitig reagiert.  Objekt wurde zum Sim zurückübertragen.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In dieser Region sind keine Physikformen aktiviert.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Sie können das Navmesh nicht regionsübergreifend modifizieren.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Hauptprim kann nicht auf formlos eingestellt werden.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In dieser Region sind keine Physikmaterialien aktiviert.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Nur bei Hauptprims können die Physikmaterialien angepasst werden.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Sie können den Nahttyp eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Sie können die Form eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Sie können diese Region nicht betreten, \nda die Region voll ist.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Verknüpfungsfehler – Eigentümer sind unterschiedlich
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Verknüpfungsfehler – zu viele Primitive
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Verknüpfungsfehler – nichts zum Verknüpfen vorhanden.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Verknüpfungsfehler – zu viele Pathfinding-Figuren
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Verknüpfungsfehler – nicht genügend Landressourcen
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert.
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sie wurden von einem Anhang an [ITEM_ID] teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Sie können hier nicht mehrere Objekte erstellen.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Objekt konnte nicht an angegebenem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Auf diesem Land können keine Pflanzen erstellt werden.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantCreateObject">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Ungültige Objektparameter
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantChangeShape">
+		Sie können diese Form nicht ändern.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Bäume und Gräser können nicht als Anhänge getragen werden.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Objekte im Gruppenbesitz können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Objekte, die Ihnen nicht gehören, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Objekte, die zum Navmesh beitragen, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Objekt kann nicht hier abgelegt werden.  Die Parzelle ist voll.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Grenzen Sie Ihre Löschparameter ein.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Asset kann nicht hochgeladen werden.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Keinen Benutzer zum Teleportieren nach Hause gefunden
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		Anforderdung nach übernatürlichen Kräften fehlgeschlagen
+	</notification>
+	<notification name="GenericRequestFailed">
+		generische Anforderdung fehlgeschlagen
+	</notification>
+	<notification name="CantUploadPostcard">
+		Postkarte kann nicht hochgeladen werden.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Inventardetails für Gruppenmitteilung kann nicht abgerufen werden.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Inventar in Mitteilung kann nicht geparst werden.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Fehler beim Hochladen von Terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Terraindatei geschrieben.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Terraindatei geschrieben, Download beginnt...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain geformt.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Sie sind nicht der autorisierte Käufer dieser Parzelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -&gt; „Fehler melden“...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Land wurde geteilt.
+	</notification>
+	<notification name="PassPurchased">
+		Sie haben einen Pass gekauft.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Region lässt keine Werbung zu.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ihr Pass für dieses Land läuft demnächst ab.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Land in Gruppenbesitz kann nicht übertragen werden.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Passkauf momentan nicht möglich.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Objekt kann nicht erstellt werden, \nda die Parzelle voll ist.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Landmarke für dieses Ereignis kann nicht erstellt werden.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Ihre übernatürlichen Kräfte heben das Einfrieren auf!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert.
+	</notification>
+	<notification name="ExpireExplanation">
+		Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung.
+	</notification>
+	<notification name="DieExplanation">
+		Das System kann Ihre Anfrage nicht verarbeiten.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Sie haben nicht genügend Geld, um Primitive zu erstellen.
+	</notification>
+	<notification name="RezObjectFailure">
+		Sie haben nicht genügend Geld, um Objekt zu erstellen.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Zuhause-Position neu festlegen, da Zuhause nicht zulässig war.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="SetHomePosition">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Angefordertes Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Angeforderter Inventarordner kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateInventory">
+		Dieses Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Landmarke kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Inventar steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantFindInvItem">
+		Inventarobjekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantFindObject">
+		Objekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Nicht ersichtlich, wer bezahlt werden muss.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Sie können öffentlichen Objekten keine L$ geben.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Inventarerstellung für Inworld-Objekt fehlgeschlagen.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden.  Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden.  Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht.
+		<usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht.
+		<usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt.
+		<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
index dcfcffa6e2..79a2ebe9df 100644
--- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/>
 	<icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/>
 	<icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index 2d140515d4..c105a5b8a3 100644
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel" width="300">
-	<text left_pad="5" name="title_text" width="260">
-		Liste der ignorierten Einwohner
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
-	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
-	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
-	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtern" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/>
+		<menu_button name="view_btn" tool_tip="Sortieroptionen"/>
+		<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
+		<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..a9bfe4754e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(laden)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..afeaa14e81
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/>
+	<icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/>
+	<button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
index d097a2b18c..fc911a64df 100644
--- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Unbekannt"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 4e76147746..8c05ca2c24 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -14,81 +14,53 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_filtered_friends_msg">
 		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche].
 	</string>
-	<string name="people_filter_label" value="Nach Leuten filtern"/>
-	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
 	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
-	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
-		<panel label="MEINE FREUNDE" name="friends_panel">
+		<panel label="FREUNDE" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEINE GRUPPEN" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Optionen"/>
-				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
-				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
+		<panel label="GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/>
+				<menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
 			</panel>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
+		<panel label="IGNORIERT" name="blocked_panel">
+			<panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index c9ae350147..8193fd42c1 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<text name="font_size">
-		Schriftgröße:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Klein" name="radio" value="0"/>
-		<radio_item label="Mittel" name="radio2" value="1"/>
-		<radio_item label="Groß" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
-	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
-	<check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
-	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IMs anzeigen in:
-	</text>
-	<text name="requires_restart_label">
-		(Neustart erforderlich)
-	</text>
-	<radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich).">
-		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
-		<radio_item label="Registerkarten" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Popups für eingehende Chats aktivieren:
-	</text>
-	<check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/>
-	<check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/>
-	<spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/>
-	<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
+		<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Schriftgröße:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Klein" name="Small" value="0"/>
+			<item label="Mittel" name="Medium" value="1"/>
+			<item label="Groß" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Benachrichtigungen
+		</text>
+		<text name="friend_ims">
+			IMs von Freunden:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IMs von anderen:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			Konferenz-IMs:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Gruppen-Chat:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat in der Nähe:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Sound abspielen:
+		</text>
+		<check_box label="Neue Unterhaltung" name="new_conversation"/>
+		<check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
+		<check_box label="Teleport-Angebot" name="teleport_offer"/>
+		<check_box label="Inventarangebot" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Protokoll löschen..." name="clear_log"/>
+		<button label="Protokolle löschen..." name="delete_transcripts"/>
+		<button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
+	</panel>
 	<button label="Übersetzen..." name="ok_btn"/>
 	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
 	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 979ccba48d..4e453b6969 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Antwort, wenn im „Beschäftigt“-Modus:
+		Nicht-stören-Antwort:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 4c8d77d336..29239033fe 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
+			<combo_box.item label="Zoomen" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 79cb73ecf9..e142cb8029 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=de-DE&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
@@ -622,8 +622,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AvatarAway">
 		Abwesend
 	</string>
-	<string name="AvatarBusy">
-		Beschäftigt
+	<string name="AvatarDoNotDisturb">
+		Nicht stören
 	</string>
 	<string name="AvatarMuted">
 		Ignoriert
@@ -859,6 +859,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat in der Nähe
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat in der Nähe)
+	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
@@ -922,12 +928,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
-	<string name="TeleportYourAgent">
-		Sie teleportieren
-	</string>
 	<string name="NotConnected">
 		Nicht verbunden
 	</string>
+	<string name="AgentNameSubst">
+		(Sie)
+	</string>
+	<string name="TeleportYourAgent">
+		Sie teleportieren
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1009,18 +1018,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="dictionary_files">
 		Wörterbücher
 	</string>
-	<string name="AvatarSetNotAway">
-		Nicht abwesend
-	</string>
-	<string name="AvatarSetAway">
-		Abwesend
-	</string>
-	<string name="AvatarSetNotBusy">
-		Nicht beschäftigt
-	</string>
-	<string name="AvatarSetBusy">
-		Beschäftigt
-	</string>
 	<string name="shape">
 		Form
 	</string>
@@ -1989,8 +1986,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
-	<string name="BusyModeResponseDefault">
-		Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden.  Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden.
+	<string name="DoNotDisturbModeResponseDefault">
+		Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen.
 	</string>
 	<string name="MuteByName">
 		(Nach Namen)
@@ -2103,9 +2100,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Inhalte
-	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
 	</string>
@@ -3877,7 +3871,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Generelle Region
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
+		Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird.
@@ -3954,6 +3948,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="IM_unblock_only_groups_friends">
 		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
@@ -3963,6 +3963,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="you_joined_call">
 		Sie sind dem Gespräch beigetreten
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war.
+	</string>
 	<string name="name_started_call">
 		[NAME] hat einen Voice-Anruf begonnen
 	</string>
@@ -3979,7 +3982,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Wird verbunden...
 	</string>
 	<string name="conference-title">
-		Ad-hoc-Konferenz
+		Chat mit mehreren Personen
 	</string>
 	<string name="conference-title-incoming">
 		Konferenz mit [AGENT_NAME]
@@ -4859,6 +4862,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Unterhaltungen
+	</string>
 	<string name="Command_Compass_Label">
 		Kompass
 	</string>
@@ -4934,6 +4940,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Tooltip">
 		Mit Leuten in der Nähe chatten
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Mit allen unterhalten
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Kompass
 	</string>
@@ -5063,4 +5072,13 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="UserDictionary">
 		[Benutzer]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
new file mode 100644
index 0000000000..9202fab92d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar la gente" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
new file mode 100644
index 0000000000..f579e720fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSACIÓN:">
+	<floater.string name="Title">
+		CONVERSACIÓN: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
index 1cd752e6ec..f772441141 100644
--- a/indra/newview/skins/default/xui/es/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSACIONES"/>
+<multi_floater name="floater_im_box" title="CONVERSACIONES">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
+					<button name="add_btn" tool_tip="Iniciar una conversación nueva"/>
+					<button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Cerrar este panel"/>
+					<text name="stub_textbox">
+						Esta conversación está en una ventana aparte.   [secondlife:/// Traerla de vuelta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 3d9d17fc81..5f38fbd615 100644
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/>
+	<floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/>
+	<floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/>
+	<floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<button name="add_btn" tool_tip="Añadir alguien a esta conversación"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexión de voz"/>
+				<button name="close_btn" tool_tip="Finalizar esta conversación"/>
+				<button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index b5b756abb6..acbb25b713 100644
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anónimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		está llamando.
+		te está llamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha entrado en un chat de voz en multiconferencia.
@@ -25,9 +25,9 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz?
 	</floater.string>
 	<text name="question">
-		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
+		Si respondes, te desconectarás de la conversación de voz actual.
 	</text>
-	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
-	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
-	<button label="Comenzar un MI" name="Start IM"/>
+	<button label="Responder" label_selected="Responder" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Abrir MI en su lugar" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index e93ecc9e10..3602270e5a 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostrar:
 			</text>
-			<check_box label="Mundo virtual" name="show_world"/>
+			<check_box label="Prueba" name="show_world"/>
 			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 93bc9f293c..01b024bc3e 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Vista previa inmediata" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vista previa inhabilitada"/>
 	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..1115d67239
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ">
+	<slider label="Chat de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 1a265845af..02ebe80ff7 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ">
+<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
 	<string name="no_voice_effect">
 		(Sin transformación de voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
new file mode 100644
index 0000000000..0ebc511887
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUMEN DE VOZ">
+	<slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
index ff8ad0977a..a889992b8a 100644
--- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
new file mode 100644
index 0000000000..e4e9a0bf63
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
+	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar la voz" name="block_unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+	<menu_item_call label="Perfil del grupo" name="group_profile"/>
+	<menu_item_call label="Activar el grupo" name="activate_group"/>
+	<menu_item_call label="Abandonar el grupo" name="leave_group"/>
+	<context_menu label="Opciones del moderador" name="Moderator Options">
+		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
+		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..090e6fb0bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Llamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir el historial de chat..." name="Chat history"/>
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..b8b4616b2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por fecha" name="sort_by_date"/>
+	<menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/>
+	<menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
new file mode 100644
index 0000000000..5ba0fb898e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..6ea970b826
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compacta" name="compact_view"/>
+	<menu_item_check label="Vista ampliada" name="expanded_view"/>
+	<menu_item_check label="Mostrar tiempo" name="IMShowTime"/>
+	<menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index 7e4578b950..a99c889bb0 100644
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
 	<menu_item_call label="Ignorar..." name="Block"/>
+	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
+	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 558ff6afd3..56e64c729f 100644
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
 		<menu_item_call label="Ojos nuevos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Abrir todas las carpetas" name="expand"/>
+	<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
 	<menu_item_call label="Renombrar el vestuario" name="rename"/>
 	<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml
new file mode 100644
index 0000000000..fcfeeb922b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferencias de chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversaciones..." name="Conversation"/>
+	<menu_item_check label="Traducir el chat" name="Translate_chat"/>
+	<menu_item_check label="Configuración de traducción..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..986389a4fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="No ignorar" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..10f6a3fc14
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/>
+	<menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..bc557c7ec1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
new file mode 100644
index 0000000000..ad896c1b74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
+	<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 51bd2c7208..125e25cd1a 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Llamada de voz" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
new file mode 100644
index 0000000000..c3973625b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index dc1486d879..09bb119d5a 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
-	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Ver el historial de chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index 227c5ebe58..9df160f5ad 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
-	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigos" name="add_friends"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Visita" name="call"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..c2fb360dd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
new file mode 100644
index 0000000000..f0ffd14024
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por más reciente" name="sort_most"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index a089c8f68e..69a03671ab 100644
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/>
+	<menu_item_call label="Ver el perfil" name="show_agent"/>
+	<menu_item_call label="Enviar un MI..." name="send_im"/>
+	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index 8791a290af..e78fdec558 100644
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar la información del objeto" name="show_object"/>
+	<menu_item_call label="Perfil del objeto..." name="show_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index d80150ef6d..30842f53f2 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Estado" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
-		</menu>
+		<menu label="Estado" name="Status"/>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -31,14 +28,18 @@
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
+		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
-		<menu_item_check label="Configuración de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Transformación de voz..." name="ShowVoice"/>
+		<menu label="Transformación de voz" name="VoiceMorphing">
+			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Probar..." name="Preview"/>
+			<menu_item_call label="Suscribir..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Gente cerca" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Gente cerca" name="Active Speakers"/>
 		<menu_item_call label="Lista de ignorados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -114,7 +115,6 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Tomar" name="Menu Object Take"/>
 			<menu_item_call label="Coger una copia" name="Take Copy"/>
-			<menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -129,6 +129,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opciones" name="Options">
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
@@ -158,6 +159,13 @@
 	<menu label="Ayuda" name="Help">
 		<menu_item_call label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guía del usuario" name="User’s guide"/>
+		<menu_item_call label="Base de Conocimientos" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Foros comunitarios" name="Community Forums"/>
+		<menu_item_call label="Portal de soporte" name="Support portal"/>
+		<menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar una infracción" name="Report Abuse"/>
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
@@ -335,9 +343,14 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocidad de animación" name="Animation Speed">
+				<menu_item_call label="Acelerar todas las animaciones un 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Ralentizar todas las animaciones un 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Restablecer la velocidad de todas las animaciones" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animaciones a cámara lenta" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Animation Info" name="Animation Info"/>
-			<menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/>
 			<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="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 7dfb27717d..05455f54c3 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -511,6 +511,24 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos.  La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=es
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -1553,10 +1571,13 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 		En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Pasar al modo ocupado.
-Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera.
-		<usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones.
+
+- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias &gt; General).
+- Se rehusarán los ofrecimientos de teleporte.
+- Se rechazarán las llamadas de voz.
+		<usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta.
@@ -2043,6 +2064,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta?
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación.
+		<usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
@@ -2116,14 +2141,14 @@ Linden Lab
 			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
-	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
-		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
+	<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
+		Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
 
-¿Quieres salir del modo Ocupado antes de completar esta transacción?
+¿Deseas desactivar No molestar antes de finalizar esta transacción?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/>
-			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
-			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
+			<ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/>
+			<button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/>
+			<button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2258,11 +2283,8 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 	<notification name="GroupNotice">
 		Asunto: [SUBJECT], Mensaje: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está conectado
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está desconectado
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
@@ -2490,13 +2512,6 @@ Aquí no puedes volar.
 	<notification name="DynamicPathfindingDisabled">
 		Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto. Para que los objetos móviles se comporten correctamente, pulsa el botón “Recargar la región”. Si quieres más información, elige “Ayuda”.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Ayuda" ignoretext="Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2757,9 +2772,9 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
   
-Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
+No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
 		<form name="form">
 			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
@@ -3331,4 +3346,633 @@ Intento cancelado.
 		Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
 		<usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] te ha descongelado.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Error al congelar: no tienes permisos de administrador en esa parcela.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		La congelación ha terminado, puedes seguir con tus asuntos.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Lo sentimos, ese usuario no se puede congelar.
+	</notification>
+	<notification name="NowOwnObject">
+		Ahora eres el propietario del objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		El objeto no se puede colocar porque hay demasiadas solicitudes.
+	</notification>
+	<notification name="SitFailCantMove">
+		No te puedes sentar porque en este momento no puedes desplazarte.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		No te puedes sentar porque no tienes permiso para estar en ese terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Acércate. No te puedes sentar en el objeto porque
+no está en la misma región que tú.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		No se puede crear el nuevo objeto. La región está llena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		No puedes crear árboles y hierba en un terreno que no es tuyo.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Error al copiar: careces de permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Error al copiar: no se te puede transferir el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Error al copiar porque el objeto &apos;[OBJ_NAME]&apos; contribuye al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicación sin objetos raíz seleccionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		No se pueden duplicar objetos porque la región está llena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		No se puede crear el objeto porque 
+la parcela está llena.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Error al intentar colocar un objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		No se puede crear un objeto que ha causado problemas en esta región.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Ese objeto de inventario está en la lista negra.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Búsqueda de terrenos bloqueada.
+Has realizado demasiadas búsquedas de terreno con excesiva rapidez.
+Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Has muerto y te has teleportado a tu lugar de origen
+	</notification>
+	<notification name="EjectComingSoon">
+		Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		No puedes entrar en esta región porque 
+el servidor está lleno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Se ha deshabilitado Devolver el objeto a mi inventario.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque no tienes permiso para modificar el objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		No se puede guardar &apos;[OBJ_NAME]&apos; de nuevo en el inventario; esta operación está desactivada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		No se puede copiar tu selección porque no tienes permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoTransNoCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		El sistema de permisos no admite la eliminación del objeto &apos;[OBJ_NAME]&apos; del simulador.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		No se puede guardar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		No se puede guardar tu selección porque el objeto &apos;[OBJ_NAME]&apos; no se puede copiar.
+	</notification>
+	<notification name="NoModNoTaking">
+		No se puede aceptar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Error interno: tipo de destino desconocido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Error al borrar: el objeto no se encuentra
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Lo sentimos, ese usuario no se puede expulsar.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsado.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Error al expulsar: no tienes permiso de administrador en esa parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		No tienes permiso para modificar ese objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		No se puede habilitar la física para un objeto que contribuye al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		No se puede activar la física para los objetos con fotogramas clave.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		No se puede habilitar la física para el objeto: recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		¡No se puede añadir un objeto!
+	</notification>
+	<notification name="UnableEditItem">
+		¡No se puede editar esto!
+	</notification>
+	<notification name="NoPermToEdit">
+		No puedes editar esto.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		No está permitido copiar ese inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		No se puede guardar en el contenido del objeto: el objeto ya no existe.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Demasiados scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		¡No se puede añadir un script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta región no tiene habilitadas las formas de física.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		No se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		No se pueden establecer propiedades de física en ese tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		No se puede establecer que un prim raíz no tenga forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta región no tiene habilitados los materiales de física.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Solo se pueden ajustar los materiales de física de las prims raíces.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Aun no es posible configurar materiales de física para los personajes.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Una o varias de las propiedades de los materiales de física especificados no son válidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		No se puede cambiar el tipo de unión de un objeto de la malla.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		No se puede cambiar la forma de un objeto de la malla
+	</notification>
+	<notification name="FullRegionCantEnter">
+		No puedes entrar en esta región porque \nla región está llena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Error de vínculo: los propietarios son diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Error de vínculo: no se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Error de vínculo: no tienes permiso de edición.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Error de vínculo: demasiadas primitivas
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Error de vínculo: no se pueden vincular &apos;no copiable&apos; y &apos;no transferible&apos;
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Error de vínculo: no hay objetos que se puedan vincular.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Error de vínculo: demasiados personajes de pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Error de vínculo: recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Has sido teleportado al origen por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Has sido teleportado a tu origen por el objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Has sido teleportado por un anexo de [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; cuyo propietario es un usuario desconocido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		No se puede crear el objeto solicitado. La región está llena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		No puedes anexar varios objetos a un solo lugar.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Aquí no se pueden crear varios objetos.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		No se puede crear el objeto solicitado. Vuelve a intentarlo.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Error al colocar: la carga del objeto solicitado ha tardado demasiado.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		No se pueden crear plantas en este terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		No se puede restaurar el objeto. No se ha encontrado una posición del mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		No se puede colocar el objeto porque sus datos de malla no son válidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		No se puede colocar el objeto porque la región ya contiene demasiados scripts.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Tus privilegios de acceso no te permiten crear objetos allí.
+	</notification>
+	<notification name="CantCreateObject">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Los parámetros de objeto no son válidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Tus privilegios de acceso no te permiten duplicar objetos aquí.
+	</notification>
+	<notification name="CantChangeShape">
+		No tienes permiso para cambiar esta forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Tus privilegios de acceso no te permiten reclamar objetos aquí.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Error de transferencia: no tienes permiso para transferir objetos para tu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Tus privilegios de acceso no te autorizan a comprar objetos aquí.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		No se puede anexar el objeto porque un avatar está sentado en él.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		No te puedes poner árboles y hierba como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		No se pueden anexar objetos que son propiedad de grupos.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		No puedes anexar objetos de los que no eres propietario.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		No se pueden anexar objetos que contribuyen al navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		No se puede anexar el objeto porque no tienes permiso para moverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Error al soltar el anexo: no tienes permiso para soltarlo allí.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Error al soltar el anexo: recurso de terreno disponible insuficiente.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Error al soltar los anexos: los recursos disponibles son insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		No se puede soltar el objeto aquí. La parcela está llena.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Acota los parámetros de eliminación.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		No se puede subir el activo.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		No se ha podido encontrar el usuario para teleportarlo al origen
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		error en la solicitud de superpoderes
+	</notification>
+	<notification name="GenericRequestFailed">
+		error de solicitud genérico
+	</notification>
+	<notification name="CantUploadPostcard">
+		No se puede subir la postal. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		No se pueden obtener los datos de inventario del aviso de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		No se puede enviar el aviso de grupo: no está permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		No se puede enviar el aviso del grupo: el inventario no se puede construir.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		No se puede analizar el inventario del aviso.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Error al subir terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Se ha registrado el archivo de terreno.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Archivo de terreno registrado, iniciando la descarga...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno predeterminado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Para comprar esta parcela debes actualizar el visor.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Error al comprar: esta parcela no está en venta.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		No se puede comprar: el precio de venta o la superficie del terreno han cambiado.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		No eres el comprador autorizado de esta parcela.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		No puedes comprar esta parcela porque ya está en espera de una autorización de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		No se pueden construir objetos aquí porque se desbordaría la parcela.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		La selección no contiene suficientes parcelas alquiladas para unirlas.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -&gt; Notificar fallo...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		El terreno se ha dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Has comprado un pase.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		La región no permite anuncios.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Tu pase para este terreno está a punto de caducar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Esta superficie no es adecuada para sentarse, prueba en otro sitio.
+	</notification>
+	<notification name="CantSitNoRoom">
+		No hay sitio para sentarse aquí, prueba en otro lugar.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Error al reclamar el objeto: no tienes permiso
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Error al reclamar el objeto: no tienes suficientes L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		No se puede transferir un terreno propiedad de un grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Error al comprar el objeto, no tienes suficientes L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Error al comprar el inventario: no tienes suficientes L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		No tienes suficientes L$ para comprar un pase a este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		No se puede crear el objeto porque \nla parcela está llena.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		No se puede crear un hito para el evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		¡Tus superpoderes anulan la congelación!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Error en la solicitud de poderes especiales. Esta solicitud se ha registrado.
+	</notification>
+	<notification name="ExpireExplanation">
+		El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud.
+	</notification>
+	<notification name="DieExplanation">
+		El sistema no puede procesar tu solicitud.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Dinero insuficiente para crear la primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Dinero insuficiente para crear el objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Se ha restaurado la posición de origen, puesto que dicha posición no era válida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		No se puede quitar el objeto por un error del inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		No se puede crear el inventario solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		No se puede crear la carpeta de inventario solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		No se puede crear el inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		No se puede crear un hito.
+	</notification>
+	<notification name="CantCreateOutfit">
+		No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		El inventario no está en venta.
+	</notification>
+	<notification name="CantFindInvItem">
+		No se encuentra el objeto del inventario.
+	</notification>
+	<notification name="CantFindObject">
+		No se puede encontrar el objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		En esta región actualmente no están activadas las transferencias de dinero a los objetos.
+	</notification>
+	<notification name="CantPayNoAgent">
+		No se ha averiguado a quién se debe pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		No se pueden dar L$ a los objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Error al crear un inventario de objeto del mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo.
+		<usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup.
+		<usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		No se pueden mover los archivos. Ruta anterior restaurada.
+		<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
index 5220df5d21..c73e34b299 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index cddbad1195..a3de14ae67 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de ignorados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
-	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
-	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
-	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/>
+		<menu_button name="view_btn" tool_tip="Opciones de clasificación"/>
+		<menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/>
+		<button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..cc4a7e951d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(cargando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..2fc8cd3aff
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversación incluía voz"/>
+	<icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/>
+	<button name="delete_btn" tool_tip="Quitar esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
index 5c9f1c3688..4d682068d7 100644
--- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconocido"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index a9d38dca25..7a7dfca0b8 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar].
 	</string>
-	<string name="people_filter_label" value="Filtrar a la gente"/>
-	<string name="groups_filter_label" value="Filtrar a los grupos"/>
 	<string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/>
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
-	<filter_editor label="Filtrar" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="MIS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MIS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opciones"/>
-				<button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
-				<button name="activate_btn" tool_tip="Activar el grupo seleccionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar los grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
+				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
 			</panel>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADO" name="blocked_panel">
+			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index b0b6114e88..28bc98f988 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<text name="font_size">
-		Tamaño de la fuente:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Disminuir" name="radio" value="0"/>
-		<radio_item label="Medio" name="radio2" value="1"/>
-		<radio_item label="Aumentar" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
-	<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
-	<check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/>
-	<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar los MI en:
-	</text>
-	<text name="requires_restart_label">
-		(requiere reiniciar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
-		<radio_item label="Ventanas distintas" name="radio" value="0"/>
-		<radio_item label="Pestañas" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Permitir ventanas de chat emergentes:
-	</text>
-	<check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/>
-	<check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/>
-	<spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/>
-	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
+		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamaño de la fuente:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeña" name="Small" value="0"/>
+			<item label="Mediana" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notificaciones
+		</text>
+		<text name="friend_ims">
+			MI de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			MI de no amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="conference_ims">
+			MI de conferencia:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Para suspender provisionalmente todas las notificaciones, usa Comunicarme &gt; No molestar.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Reproducir sonido:
+		</text>
+		<check_box label="Nueva conversación" name="new_conversation"/>
+		<check_box label="Llamada de voz entrante" name="incoming_voice_call"/>
+		<check_box label="Oferta de teleporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventario" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Limpiar el registro..." name="clear_log"/>
+		<button label="Eliminar transcripciones..." name="delete_transcripts"/>
+		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
+	</panel>
 	<button label="Traducción…" name="ok_btn"/>
 	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
 	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 4fc163f5b6..98b0081da9 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta cuando estoy en modo ocupado:
+		Respuesta de No molestar:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index 9da2958953..cb061796e7 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar el objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 52bcab54e5..937433e210 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
@@ -610,8 +610,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AvatarAway">
 		Ausente
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		No molestar
 	</string>
 	<string name="AvatarMuted">
 		Ignorado
@@ -844,6 +844,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ST_NO_JOINT">
 		No se puede encontrar ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat)
+	</string>
 	<string name="whisper">
 		susurra:
 	</string>
@@ -907,6 +913,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
+	<string name="AgentNameSubst">
+		(Tú)
+	</string>
 	<string name="TeleportYourAgent">
 		Teleportarte
 	</string>
@@ -991,18 +1000,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="dictionary_files">
 		Diccionarios
 	</string>
-	<string name="AvatarSetNotAway">
-		Salir del estado ausente
-	</string>
-	<string name="AvatarSetAway">
-		Pasar al estado ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Salir del estado ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Pasar al estado ocupado
-	</string>
 	<string name="shape">
 		Forma
 	</string>
@@ -1959,8 +1956,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="PanelContentsNewScript">
 		Script nuevo
 	</string>
-	<string name="BusyModeResponseDefault">
-		El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente tiene activado &apos;No molestar&apos; y verá tu mensaje más tarde.
 	</string>
 	<string name="MuteByName">
 		(Por el nombre)
@@ -2073,9 +2070,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenidos
-	</string>
 	<string name="AcquiredItems">
 		Artículos adquiridos
 	</string>
@@ -3793,7 +3787,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Región General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Los avatares están visibles y está permitido el chat fuera de esta parcela
+		Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue.
@@ -3867,6 +3861,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Saved_message">
 		(Guardado [LONG_TIMESTAMP])
 	</string>
+	<string name="OnlineStatus">
+		Conectado/a
+	</string>
+	<string name="OfflineStatus">
+		Desconectado/a
+	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
@@ -3876,6 +3876,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Has entrado en la llamada de voz
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Rechazaste la llamada de voz automáticamente porque estaba activado &apos;No molestar&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] inició una llamada de voz
 	</string>
@@ -3888,6 +3891,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Se colgó la llamada de voz
 	</string>
+	<string name="conference-title">
+		Chat multi-persona
+	</string>
 	<string name="conference-title-incoming">
 		Conferencia con [AGENT_NAME]
 	</string>
@@ -4766,6 +4772,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversaciones
+	</string>
 	<string name="Command_Compass_Label">
 		Brújula
 	</string>
@@ -4841,6 +4850,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Tooltip">
 		Habla por chat de texto con las personas próximas
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar con todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Brújula
 	</string>
@@ -4970,4 +4982,13 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="UserDictionary">
 		[Usuario]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
new file mode 100644
index 0000000000..e9017c79b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..9a486a84c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSATION:">
+	<floater.string name="Title">
+		CONVERSATION: [NAME]
+	</floater.string>
+	<text name="page_label" value="Page"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
index 5ea073365e..f0b17e8437 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
+<multi_floater name="floater_im_box" title="CONVERSATIONS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
+					<button name="add_btn" tool_tip="Commencer une nouvelle conversation"/>
+					<button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/>
+					<text name="stub_textbox">
+						Cette conversation s&apos;affiche dans une fenêtre distincte.   [secondlife:/// la rattacher.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 516eb41362..8ab98b8e4e 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="À" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] a été invité à la conversation."/>
+	<floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/>
+	<floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/>
+	<floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/>
+	<floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/>
+	<floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/>
+				<button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/>
+				<button name="close_btn" tool_tip="Mettre fin à cette conversation"/>
+				<button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="À" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
index 7594eec5f2..9e6946ba9e 100644
--- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonyme
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		appelle.
+		vous appelle.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		a rejoint un chat vocal avec conférence.
@@ -25,9 +25,9 @@
 		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</floater.string>
 	<text name="question">
-		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
+		Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle.
 	</text>
-	<button label="Accepter" label_selected="Accepter" name="Accept"/>
-	<button label="Refuser" label_selected="Refuser" name="Reject"/>
-	<button label="Lancer IM" name="Start IM"/>
+	<button label="Répondre" label_selected="Répondre" name="Accept"/>
+	<button label="Ignorer" label_selected="Ignorer" name="Reject"/>
+	<button label="Ouvrir IM à la place" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 02d969dc08..0bcf55aba5 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Afficher :
 			</text>
-			<check_box label="Monde" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
 			<check_box label="Maillage de navigation" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index f86c1a4217..eace67026c 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..f4f452eea7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL">
+	<slider label="Chat vocal" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index 671fb5c14d..f9a76d127e 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX">
+<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
 	<string name="no_voice_effect">
 		(Aucun effet de voix)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
new file mode 100644
index 0000000000..bf91a5bb79
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE LA VOIX">
+	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
index 8276d57025..fea0486d8a 100644
--- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/>
-	<menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
new file mode 100644
index 0000000000..857ead603b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
+	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
+	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Supprimer ces amis" name="remove_friends"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="block_unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+	<menu_item_call label="Profil du groupe" name="group_profile"/>
+	<menu_item_call label="Activer le groupe" name="activate_group"/>
+	<menu_item_call label="Quitter le groupe" name="leave_group"/>
+	<context_menu label="Options du modérateur" name="Moderator Options">
+		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
+		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/>
+		<menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..4e7e84199d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Appel..." name="Call"/>
+	<menu_item_call label="Ouvrir l&apos;historique du chat..." name="Chat history"/>
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Téléporter" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="Invite"/>
+	<menu_item_call label="Carte" name="Map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..c515a8e8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par date" name="sort_by_date"/>
+	<menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/>
+	<menu_item_call label="Afficher l&apos;historique du Chat près de moi" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
new file mode 100644
index 0000000000..1ec5910c8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..03a091d1cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vue compacte" name="compact_view"/>
+	<menu_item_check label="Vue développée" name="expanded_view"/>
+	<menu_item_check label="Afficher l’heure" name="IMShowTime"/>
+	<menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 69f8e88a0d..7c94930160 100644
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
 	<menu_item_call label="Ignorer..." name="Block"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Me téléporter à l’emplacement de l&apos;objet" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index b5181f4f82..21b19eded6 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Développer tous les dossiers" name="expand"/>
+	<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
new file mode 100644
index 0000000000..1811082c84
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/>
+	<menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/>
+	<menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/>
+	<menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Préférences pour le chat..." name="chat_preferences"/>
+	<menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/>
+	<menu_item_check label="Journal des conversations..." name="Conversation"/>
+	<menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/>
+	<menu_item_check label="Paramètres de traduction" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..47589572c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Ne plus ignorer" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..79880dd16d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
+	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..13f1575090
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par type" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..cc81172462
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par statut" name="sort_status"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
+	<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
index eb51b4cf7e..8e32f065fa 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Afficher les infos" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Appel" name="Call"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Quitter" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..79ede5e22d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 26bd3978a9..6f7d02ef74 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Devenir amis" name="Add Friend"/>
-	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Carte" name="Map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Afficher l&apos;historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
index 8400ec0a14..37abf831c2 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Devenir amis" name="Add Friends"/>
-	<menu_item_call label="Supprimer des amis" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friends"/>
+	<menu_item_call label="Supprimer des amis" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Appeler" name="call"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..086002dce5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par distance" name="sort_distance"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher la carte" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a7d698ab7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index 5ed627fbc3..d701b3a414 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
+	<menu_item_call label="Voir le profil" name="show_agent"/>
+	<menu_item_call label="Envoyer IM..." name="send_im"/>
+	<menu_item_call label="Devenir amis..." name="add_friend"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index f581c3ef9d..0a934d3e69 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
+	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 85020afe25..457b756c7d 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Statut" name="Status">
-			<menu_item_call label="Absent" name="Set Away"/>
-			<menu_item_call label="Occupé" name="Set Busy"/>
-		</menu>
+		<menu label="Statut" name="Status"/>
 		<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="Page d&apos;accueil du compte..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversations..." name="Conversations"/>
+		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
-		<menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/>
-		<menu_item_check label="Effet de voix..." name="ShowVoice"/>
+		<menu label="Effet de voix" name="VoiceMorphing">
+			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
+			<menu_item_check label="Aperçu..." name="Preview"/>
+			<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestes..." name="Gestures"/>
-		<menu_item_call label="Amis" name="My Friends"/>
-		<menu_item_call label="Groupes" name="My Groups"/>
-		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_check label="Amis" name="My Friends"/>
+		<menu_item_check label="Groupes" name="My Groups"/>
+		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
 		<menu_item_call label="Liste des ignorés" name="Block List"/>
 	</menu>
 	<menu label="Monde" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Acheter" name="Menu Object Buy"/>
 			<menu_item_call label="Prendre" name="Menu Object Take"/>
 			<menu_item_call label="Prendre une copie" name="Take Copy"/>
-			<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Renvoi de l&apos;objet" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Options" name="Options">
 			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Aide rapide..." name="How To"/>
 		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guide de l&apos;utilisateur" name="User’s guide"/>
+		<menu_item_call label="Base de connaissances" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forums de la communauté" name="Community Forums"/>
+		<menu_item_call label="Portail d&apos;assistance" name="Support portal"/>
+		<menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
@@ -385,9 +393,14 @@
 				<menu_item_call label="Test femme" name="Test Female"/>
 				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Vitesse d&apos;animation" name="Animation Speed">
+				<menu_item_call label="Toutes les animations 10 % plus rapides" name="All Animations 10 Faster"/>
+				<menu_item_call label="Toutes les animations 10 % plus lentes" name="All Animations 10 Slower"/>
+				<menu_item_call label="Réinitialiser la vitesse de toutes les animations" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
 			<menu_item_check label="Infos sur l&apos;animation" name="Animation Info"/>
-			<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
 			<menu_item_check label="Afficher la direction du regard" name="Show Look At"/>
 			<menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/>
 			<menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 30154d1873..e73cc6e6e0 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -515,6 +515,24 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=fr
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -1543,10 +1561,13 @@ Quitter le groupe ?
 		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Le mode Occupé est sélectionné.
-Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
-		<usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Ne pas déranger est activé.  Vous ne recevrez pas les notifications de communications entrantes.
+
+- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences &gt; Général).
+- Toutes les offres de téléportation seront refusées.
+- Les appels vocaux seront refusés.
+		<usetemplate ignoretext="J&apos;ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
@@ -2033,6 +2054,10 @@ Déplacer les objets de l&apos;inventaire ?
 		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée.  Tous les participants recevront les notifications de nouvelle conversation.
+		<usetemplate ignoretext="Confirmer l&apos;ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Êtes-vous certain de vouloir quitter ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2107,14 +2132,14 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
 	</notification>
-	<notification label="Réponse si occupé(e)" name="BusyModePay">
-		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
+	<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
+		Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
 
-Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
+Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/>
-			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
+			<ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/>
+			<button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 	<notification name="GroupNotice">
 		Sujet : [SUBJECT], Message : [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est en ligne
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est hors ligne
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
@@ -2482,13 +2504,6 @@ Vous ne pouvez pas voler ici.
 	<notification name="DynamicPathfindingDisabled">
 		La recherche de chemin dynamique n&apos;est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles. Pour que les objets mobiles se comportent correctement, cliquez sur Refiger la région. Pour plus d&apos;informations, choisissez Aide.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Aide" ignoretext="La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Une erreur est survenue. Un problème réseau ou serveur s&apos;est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2766,7 @@ Acceptez-vous ?
 	<notification name="ScriptQuestionCaution">
 		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
   
-Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
+N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
 			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
@@ -3332,4 +3347,633 @@ Désactivation des mises à jour futures de ce fichier...
 		Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
 		<usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar figé.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] vous a libéré.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar libéré.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Vous n&apos;avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Vous n&apos;êtes plus figé, vous pouvez reprendre votre vie.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Impossible de figer cet utilisateur.
+	</notification>
+	<notification name="NowOwnObject">
+		Vous êtes désormais le propriétaire de l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="CantRezOnLand">
+		Impossible de rezzer l&apos;objet à [OBJECT_POS] car le propriétaire de ce terrain de l&apos;autorise pas.  Utilisez l&apos;outil Terrain pour voir à qui appartiennent les terrains.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Impossible de rezzer l&apos;objet car il y a trop de demandes.
+	</notification>
+	<notification name="SitFailCantMove">
+		Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n&apos;est pas autorisée.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Essayez de vous rapprocher.  Impossible de vous asseoir sur l&apos;objet car
+il ne se trouve pas dans la même région que vous.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Création d&apos;un nouvel objet impossible. La région est pleine.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Vous ne pouvez pas créer d&apos;arbres ni d&apos;herbe sur un terrain qui ne vous appartient pas.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Échec de la copie car vous ne disposez pas des droits requis pour copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Échec de la copie car l&apos;objet [OBJ_NAME] ne peut pas vous être transféré.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Échec de la copie car l&apos;objet [OBJ_NAME] contribue au maillage de navigation.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Dupliquer sans objet racine sélectionné
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossible de dupliquer les objets car la région est pleine.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Création de l&apos;objet impossible car 
+la parcelle est pleine.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Échec d&apos;une tentative pour rezzer un objet.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossible de créer l&apos;article qui a provoqué des problèmes pour cette région.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Cet article d&apos;inventaire a été placé sur liste noire.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Recherche de terrain bloquée.
+Vous avez effectué trop de recherches de terrain trop rapidement.
+Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Vous êtes mort et avez été téléporté à votre domicile.
+	</notification>
+	<notification name="EjectComingSoon">
+		Votre présence ici n&apos;est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Vous ne pouvez pas pénétrer dans cette région car 
+le serveur est plein.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Le réenregistrement dans l&apos;inventaire a été désactivé.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car l&apos;objet à partir duquel il a été rezzé n&apos;existe plus.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l&apos;objet [DEST_NAME].
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossible de réenregistrer [OBJ_NAME] dans l&apos;inventaire -- cette opération a été désactivée.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car vous n&apos;avez pas le droit de copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La suppression de l&apos;objet [OBJ_NAME] du simulateur n&apos;est pas autorisée par le système de droits.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car l&apos;objet [OBJ_NAME] ne peut pas être copié.
+	</notification>
+	<notification name="NoModNoTaking">
+		Vous ne pouvez pas prendre votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="RezDestInternalError">
+		Erreur interne : type de destination inconnue.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Échec de la suppression car l&apos;objet est introuvable
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Exclusion de cet utilisateur impossible.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="HomePositionSet">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsé.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Vous n&apos;avez pas pu réaliser l&apos;exclusion car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car il n&apos;y a pas suffisamment de ressources pour cet objet sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car l&apos;autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Vous n&apos;êtes pas autorisé à modifier cet objet.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Impossible d&apos;activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec images-clés.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossible d&apos;activer les propriétés physiques pour l&apos;objet -- ressources de terrain insuffisantes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Cet objet ne peut pas contenir de morceau concave car c&apos;est un fantôme qui contribue au maillage de navigation.
+	</notification>
+	<notification name="UnableAddItem">
+		Ajout de l&apos;article impossible.
+	</notification>
+	<notification name="UnableEditItem">
+		Modification impossible
+	</notification>
+	<notification name="NoPermToEdit">
+		Modification interdite.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Pas autorisé à copier cet inventaire.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossible d&apos;enregistrer dans le contenu des objets : L&apos;article n&apos;existe plus.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossible d&apos;enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l&apos;inventaire.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossible d&apos;enregistrer dans le contenu des objets : cela modifierait les droits d&apos;attache.
+	</notification>
+	<notification name="TooManyScripts">
+		Trop de scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Ajout du script impossible.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Le serveur d&apos;actifs n&apos;a pas répondu assez vite.  Objet renvoyé dans le sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Les formes physiques ne sont pas activées pour cette région.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossible de définir les propriétés physiques pour ce type d&apos;objet.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Vous devenez définir une forme pour la prim racine.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Les matériaux physiques ne sont pas activés pour cette région.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Les matériaux physiques ne peuvent être ajustés que pour les prims racines.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		La configuration de matériaux physiques sur les personnages n&apos;est pas prise en charge actuellement.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Une ou plusieurs propriétés des ressources physiques spécifiées n&apos;étaient pas valides.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Vous ne pouvez pas changer le type de raccord d&apos;un objet avec maillage.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Vous ne pouvez pas changer la forme d&apos;un objet avec maillage.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Échec du lien -- les propriétaires sont différents
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Échec du lien car vous ne disposez pas des droits de modification.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Échec du lien -- trop de primitives
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Échec du lien -- impossible de lier pas de copie et pas de transfert
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Échec du lien - il n&apos;y a rien qui puisse être lié.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Échec du lien -- trop de personnages de recherche de chemin
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Échec du lien -- ressources de terrain insuffisantes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Vous avez été téléporté par un élément sur [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Création de l&apos;objet demandé impossible. La région est pleine.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Vous ne pouvez pas attacher plusieurs objets au même endroit.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Vous ne pouvez pas créer plusieurs objets ici.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Création de l&apos;objet demandé impossible. Objet absent de la base de données.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Création de l&apos;objet demandé impossible. Délai d&apos;attente dépassé. Veuillez réessayer.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Création de l&apos;objet demandé impossible. Veuillez réessayer.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Échec de l&apos;action « rezzer », le chargement de l&apos;objet demandé a pris trop longtemps.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Vous ne pouvez pas créer de plantes sur ce terrain.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossible de restaurer l&apos;objet. Position dans le monde introuvable.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossible de rezzer l&apos;objet car ses données de maillage ne sont pas valides.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossible de rezzer l&apos;objet car il y a déjà trop de scripts dans cette région.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à créer des objets à cet endroit.
+	</notification>
+	<notification name="CantCreateObject">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Paramètres d&apos;objet non valides
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à dupliquer des objets ici.
+	</notification>
+	<notification name="CantChangeShape">
+		Vous n’êtes pas autorisé à modifier cette forme.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Vos privilèges d&apos;accès ne vous autorisent pas à revendiquer des objets ici.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Vos privilèges d&apos;accès ne vous autorisent pas à acheter des objets ici.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossible d&apos;attacher l&apos;objet car un avatar est assis dessus.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Les arbres et les plantes ne peuvent pas être portés sous forme d&apos;éléments attachés.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossible d&apos;attacher les objets appartenant au groupe.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossible d&apos;attacher les objets contribuant au maillage de navigation.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Impossible d&apos;attacher l&apos;objet car vous n&apos;avez pas le droit de le déplacer.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</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>
+	<notification name="CantDropMeshAttachment">
+		Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l&apos;inventaire puis rezzez-les dans le monde.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		L&apos;élément n&apos;a pas pu être déposé : vous n&apos;avez pas le droit de déposer des éléments à cet endroit.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		L&apos;élément n&apos;a pas pu être déposé : ressources de terrain disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Les éléments n&apos;ont pas pu être déposés : ressources disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Impossible de déposer l&apos;objet ici.  La parcelle est pleine.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Veuillez affiner vos paramètres de suppression.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Chargement de l&apos;actif impossible.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Impossible de trouver l&apos;utilisateur à téléporter chez lui
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		échec de la demande de type divine
+	</notification>
+	<notification name="GenericRequestFailed">
+		échec de la demande générique
+	</notification>
+	<notification name="CantUploadPostcard">
+		Chargement de la carte postale impossible.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Impossible récupérer les détails de l&apos;inventaire pour la notice au groupe.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossible d&apos;envoyer une notice au groupe -- ce n&apos;est pas autorisé.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossible d&apos;envoyer une notice au groupe - échec de la construction de l&apos;inventaire.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossible d&apos;analyser l&apos;inventaire dans la notice.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Échec du chargement du terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Fichier de terrain écrit
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Fichier de terrain écrit, lancement du téléchargement...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain figé.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Vous devez mettre votre client à jour pour acheter cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Achat impossible, cette parcelle n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Achat impossible, le prix de vente ou la zone de terrain a changé.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Vous n&apos;êtes pas un acheteur autorisé pour cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d&apos;une autorisation d&apos;achat.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Vous ne pouvez pas construire d&apos;objets ici car cela saturerait la parcelle.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -&gt; Signaler un bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Le terrain a été divisé.
+	</notification>
+	<notification name="PassPurchased">
+		Vous avez acheté un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Cette région n&apos;autorise pas les petites annonces.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Votre pass pour ce terrain arrive à expiration.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Il n&apos;y a pas de surface appropriée sur laquelle s&apos;asseoir, essayez un autre endroit.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Pas de place pour s&apos;asseoir ici, essayez un autre endroit.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas des droits requis.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Impossible de céder un terrain appartenant au groupe.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Échec de l&apos;achat de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Échec de l&apos;achat d&apos;inventaire car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Impossible d&apos;acheter le pass actuellement.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Création de l&apos;objet impossible car \nla parcelle est pleine.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossible de créer le repère pour l&apos;événement.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Grâce à vos pouvoirs de type divin, vous n&apos;êtes plus figé.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée.
+	</notification>
+	<notification name="ExpireExplanation">
+		Le système ne peut pas traiter votre demande actuellement. Délai d&apos;attente dépassé.
+	</notification>
+	<notification name="DieExplanation">
+		Le système ne peut pas traiter votre demande.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fonds insuffisants pour créer la primitive.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fonds insuffisants pour créer l&apos;objet.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Réinitialiser l&apos;emplacement du domicile car il n&apos;était pas légal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="SetHomePosition">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossible de dérezzer l&apos;objet à cause d&apos;un défaut d&apos;inventaire.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Création de l&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Création du dossier d&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateInventory">
+		Création de cet inventaire impossible.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Création du repère impossible.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Création de la tenue impossible. Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventaire n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantFindInvItem">
+		Objet de l&apos;inventaire introuvable.
+	</notification>
+	<notification name="CantFindObject">
+		Objet introuvable.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Les transferts d&apos;argent aux objets sont actuellement désactivés dans cette région.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Impossible de savoir qui payer.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Vous ne pouvez pas donner de L$ à des objets publics.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Échec de la création d&apos;inventaire sur l&apos;objet Second Life.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Une erreur interne nous a empêchés de mettre votre client à jour correctement.  Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Impossible de créer de grandes prims qui coupent d&apos;autres joueurs.  Réessayez une fois que les autres joueurs se seront déplacés.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier.
+		<usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés.
+		<usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossible de déplacer les fichiers. Chemin précédent rétabli.
+		<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
index 54b8f53e59..c8fa9f340f 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/>
 	<icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/>
 	<icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
index 96add2a74b..0e2b5a9c93 100644
--- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Liste des ignorés
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
-	<button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
-	<button label="Ignorer un objet par son nom" label_selected="Ignorer un objet par son nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
-	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrer" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l&apos;objet sélectionné"/>
+		<menu_button name="view_btn" tool_tip="Options de tri"/>
+		<menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/>
+		<button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ebf18f6483
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(chargement)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..9c277842b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/>
+	<icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/>
+	<button name="delete_btn" tool_tip="Supprimer cette entrée"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
index 5fb69d1989..b1b32af7c6 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Inconnu"/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f035853efc..227ce26df7 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -14,81 +14,53 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_filtered_friends_msg">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher].
 	</string>
-	<string name="people_filter_label" value="Filtrer les personnes"/>
-	<string name="groups_filter_label" value="Filtrer les groupes"/>
 	<string name="no_filtered_groups_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/>
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
-	<filter_editor label="Filtre" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="nearby_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
-		<panel label="MES AMIS" name="friends_panel">
+		<panel label="AMIS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="friends_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Afficher d&apos;autres options"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis."/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MES GROUPES" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
-				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
-				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
+		<panel label="GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrer les groupes" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/>
+				<menu_button name="groups_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
 			</panel>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="recent_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUÉ" name="blocked_panel">
+			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 550beb653e..972190dc15 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<text name="font_size">
-		Taille de la police :
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Petite" name="radio" value="0"/>
-		<radio_item label="Moyenne" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
-	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
-	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
-	<check_box label="Bulles de chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Afficher les IM dans :
-	</text>
-	<text name="requires_restart_label">
-		(redémarrage requis)
-	</text>
-	<radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)">
-		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
-		<radio_item label="Onglets" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Activer les popups de chat entrant :
-	</text>
-	<check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message de chat de groupe."/>
-	<check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message instantané."/>
-	<spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/>
-	<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Taille de la police :
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Petite" name="Small" value="0"/>
+			<item label="Moyenne" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notifications
+		</text>
+		<text name="friend_ims">
+			IM amis :
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM non amis :
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM conférence :
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat de groupe :
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat près de moi :
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Écouter le son :
+		</text>
+		<check_box label="Nouvelle conversation" name="new_conversation"/>
+		<check_box label="Appel entrant" name="incoming_voice_call"/>
+		<check_box label="Offre de téléportation" name="teleport_offer"/>
+		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Effacer le journal..." name="clear_log"/>
+		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
+		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
+	</panel>
 	<button label="Traduction..." name="ok_btn"/>
 	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
 	<button label="Orthographe..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 66b84af3aa..533c392d6b 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="Jamais" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Réponse si occupé(e) :
+		Réponse Ne pas déranger
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index 60027d41cb..896dd932e3 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 			<combo_box.item label="Ouvrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 6a2a3f559a..69ed20f376 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=fr-FR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
@@ -622,8 +622,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AvatarAway">
 		Absent
 	</string>
-	<string name="AvatarBusy">
-		Occupé
+	<string name="AvatarDoNotDisturb">
+		Ne pas déranger
 	</string>
 	<string name="AvatarMuted">
 		Bloqué(e)
@@ -859,6 +859,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ST_NO_JOINT">
 		Impossible de trouver ROOT ou JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat près de moi
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat près de moi)
+	</string>
 	<string name="whisper">
 		chuchote :
 	</string>
@@ -922,12 +928,15 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
-	<string name="TeleportYourAgent">
-		Vous téléporter
-	</string>
 	<string name="NotConnected">
 		Pas connecté(e)
 	</string>
+	<string name="AgentNameSubst">
+		(Vous)
+	</string>
+	<string name="TeleportYourAgent">
+		Vous téléporter
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1009,18 +1018,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="dictionary_files">
 		Dictionnaires
 	</string>
-	<string name="AvatarSetNotAway">
-		Présent
-	</string>
-	<string name="AvatarSetAway">
-		Absent
-	</string>
-	<string name="AvatarSetNotBusy">
-		Pas occupé
-	</string>
-	<string name="AvatarSetBusy">
-		Occupé
-	</string>
 	<string name="shape">
 		Silhouette
 	</string>
@@ -1989,8 +1986,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
+	<string name="DoNotDisturbModeResponseDefault">
+		Ce résident a activé Ne pas déranger et verra votre message plus tard.
 	</string>
 	<string name="MuteByName">
 		(par nom)
@@ -2103,9 +2100,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenus
-	</string>
 	<string name="AcquiredItems">
 		Objets acquis
 	</string>
@@ -3877,7 +3871,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Région de type Général
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatars visibles et chat autorisé en dehors de cette parcelle
+		Les avatars à l&apos;extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l&apos;intérieur.
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu&apos;elle n&apos;est pas refigée.
@@ -3954,6 +3948,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM, sous Préférences/Confidentialité.
 	</string>
+	<string name="OnlineStatus">
+		En ligne
+	</string>
+	<string name="OfflineStatus">
+		Hors ligne
+	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
@@ -3963,6 +3963,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Vous avez rejoint l&apos;appel
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Vous avez automatiquement refusé l&apos;appel vocal quand le mode Ne pas déranger était activé.
+	</string>
 	<string name="name_started_call">
 		[NAME] appelle.
 	</string>
@@ -3979,7 +3982,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Connexion en cours...
 	</string>
 	<string name="conference-title">
-		Conférence ad-hoc
+		Chat à plusieurs
 	</string>
 	<string name="conference-title-incoming">
 		Conférence avec [AGENT_NAME]
@@ -4859,6 +4862,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversations
+	</string>
 	<string name="Command_Compass_Label">
 		Boussole
 	</string>
@@ -4934,6 +4940,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Tooltip">
 		Parler aux personnes près de vous par chat écrit
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Parler à quelqu&apos;un
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Boussole
 	</string>
@@ -5063,4 +5072,13 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
new file mode 100644
index 0000000000..8354824ed1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtro persone" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
new file mode 100644
index 0000000000..d0e9c8ee0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSAZIONE:">
+	<floater.string name="Title">
+		CONVERSAZIONE: [NAME]
+	</floater.string>
+	<text name="page_label" value="Pagina"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
index fb8e77b32f..10cf1b7f7e 100644
--- a/indra/newview/skins/default/xui/it/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAZIONI"/>
+<multi_floater name="floater_im_box" title="CONVERSAZIONI">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/>
+					<button name="add_btn" tool_tip="Avvia una nuova conversazione"/>
+					<button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/>
+					<text name="stub_textbox">
+						Questa conversazione in una finestra separata.   [secondlife:/// Ripristina conversazione.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index 3d9d17fc81..d38ec7a5fe 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/>
+	<floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/>
+	<floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/>
+	<floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/>
+	<floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l&apos;elenco dei partecipanti"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/>
+				<button name="voice_call_btn" tool_tip="Apri collegamento voce"/>
+				<button name="close_btn" tool_tip="Termina questa conversazione"/>
+				<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduci chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index a95ed44662..566920209d 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		sta chiamando.
+		ti sta chiamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha aderito ad una chiamata in chat vocale in conferenza.
@@ -25,9 +25,9 @@
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
-		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
+		Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente.
 	</text>
-	<button label="Accetta" label_selected="Accetta" name="Accept"/>
-	<button label="Rifiuta" label_selected="Rifiuta" name="Reject"/>
-	<button label="Inizia IM" name="Start IM"/>
+	<button label="Risposta" label_selected="Risposta" name="Accept"/>
+	<button label="Ignora" label_selected="Ignora" name="Reject"/>
+	<button label="Apri invece IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 77be220a2a..7777444161 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostra:
 			</text>
-			<check_box label="Mondo" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index c97a91bb3f..27a17868a7 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Default" label_selected="Default" name="Default"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
 	<button label="Niente" label_selected="Niente" name="None"/>
-	<check_box initial_value="true" label="Anteprima dal vivo" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Anteprima disattivata"/>
 	<filter_editor label="Filtro texture" name="inventory search editor"/>
 	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..b168d067c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE">
+	<slider label="Chat vocale" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index c83b11f698..f102622f5d 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE">
+<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
 	<string name="no_voice_effect">
 		(Nessuna manipolazione voce)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
new file mode 100644
index 0000000000..eaeda7597f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME VOCE">
+	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
index 10524ba92d..984e4a1611 100644
--- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
new file mode 100644
index 0000000000..46ced93f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
+	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
+	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca voce" name="block_unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+	<menu_item_call label="Profilo del gruppo" name="group_profile"/>
+	<menu_item_call label="Attiva gruppo" name="activate_group"/>
+	<menu_item_call label="Lascia il gruppo" name="leave_group"/>
+	<context_menu label="Opzioni moderatore" name="Moderator Options">
+		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
+		<menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
+		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..5686a902eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Chiamata a voce..." name="Call"/>
+	<menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/>
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="Invite"/>
+	<menu_item_call label="Mappa" name="Map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..73b05831ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
+	<menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/>
+	<menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
new file mode 100644
index 0000000000..1621d57e12
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Aggiungi come amico" name="Add Friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca voce" name="Block/Unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..350fbc5c6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compatta" name="compact_view"/>
+	<menu_item_check label="Vista espansa" name="expanded_view"/>
+	<menu_item_check label="Mostra orario" name="IMShowTime"/>
+	<menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 0f347b1a90..9623775af4 100644
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
 	<menu_item_call label="Blocca..." name="Block"/>
+	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
+	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 09fc867d7c..3ac0c5ce69 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nuovi capelli" name="New Hair"/>
 		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Apri tutte le cartelle" name="expand"/>
+	<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml
new file mode 100644
index 0000000000..c87cda57bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferenze chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferenze privacy..." name="privacy_preferences"/>
+	<menu_item_check label="Registro conversazioni..." name="Conversation"/>
+	<menu_item_check label="Traduci chat vicina" name="Translate_chat"/>
+	<menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..e9955923b2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Sblocca" name="unblock"/>
+	<menu_item_call label="Profilo..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..cbcf084b86
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..fc80c73ae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base al tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
new file mode 100644
index 0000000000..972e359cfe
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
+	<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
index 30a97a1c72..8ca7537ee0 100644
--- a/indra/newview/skins/default/xui/it/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Mostra informazioni" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Chiamata a voce" name="Call"/>
 	<menu_item_call label="Attiva" name="Activate"/>
 	<menu_item_call label="Chiudi" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
new file mode 100644
index 0000000000..56b9abbd3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index a974bd181d..1c09b1cfe2 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Aggiungi amico" name="Add Friend"/>
-	<menu_item_call label="Rimuovi amico" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Mappa" name="Map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
index e0b9ceb63d..b9ce70167f 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Aggiungi amici" name="Add Friends"/>
-	<menu_item_call label="Rimuovi amici" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi amici" name="add_friends"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Chiama" name="call"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..223d88fee1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra mappa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
new file mode 100644
index 0000000000..fc6213bd08
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index 37755d5749..abfbab35a3 100644
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra profilo residente" name="show_agent"/>
+	<menu_item_call label="Vedi profilo" name="show_agent"/>
+	<menu_item_call label="Manda IM..." name="send_im"/>
+	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 763e65f17c..8456d14b63 100644
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra informazioni oggetto" name="show_object"/>
+	<menu_item_call label="Profilo oggetto..." name="show_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 547c5a9b73..c93b92029f 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Stato" name="Status">
-			<menu_item_call label="Assente" name="Set Away"/>
-			<menu_item_call label="Non disponibile" name="Set Busy"/>
-		</menu>
+		<menu label="Stato" name="Status"/>
 		<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="Dashboard dell&apos;account..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversazioni..." name="Conversations"/>
+		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
-		<menu_item_check label="Impostazioni voce..." name="Nearby Voice"/>
-		<menu_item_check label="Manipolazione voce..." name="ShowVoice"/>
+		<menu label="Manipolazione voce" name="VoiceMorphing">
+			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
+			<menu_item_check label="Anteprima..." name="Preview"/>
+			<menu_item_call label="Abbonati..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesture..." name="Gestures"/>
-		<menu_item_call label="Amici" name="My Friends"/>
-		<menu_item_call label="Gruppi" name="My Groups"/>
-		<menu_item_call label="Persone vicine" name="Active Speakers"/>
+		<menu_item_check label="Amici" name="My Friends"/>
+		<menu_item_check label="Gruppi" name="My Groups"/>
+		<menu_item_check label="Persone vicine" name="Active Speakers"/>
 		<menu_item_call label="Blocca lista" name="Block List"/>
 	</menu>
 	<menu label="Mondo" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Acquista" name="Menu Object Buy"/>
 			<menu_item_call label="Prendi" name="Menu Object Take"/>
 			<menu_item_call label="Prendi copia" name="Take Copy"/>
-			<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opzioni" name="Options">
 			<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Istruzioni..." name="How To"/>
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guida dell&apos;utente" name="User’s guide"/>
+		<menu_item_call label="Base di conoscenza" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forum della comunità" name="Community Forums"/>
+		<menu_item_call label="Portale assistenza" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
 		<menu_item_call label="Segnala abuso" name="Report Abuse"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
@@ -336,9 +344,14 @@
 				<menu_item_call label="Alterna la geometria dei personaggi" name="Toggle Character Geometry"/>
 				<menu_item_check label="Consenti selezione avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocità animazione" name="Animation Speed">
+				<menu_item_call label="Accelera tutte le animazioni del 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Rallenta tutte le animazioni del 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Ripristina la velocità di tutte le animazioni" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Forza i parametri sui valori predefiniti" name="Force Params to Default"/>
 			<menu_item_check label="Informazioni sull&apos;animazione" name="Animation Info"/>
-			<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
 			<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 bersaglio" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index d5fdde4e7d..8adbebb62a 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -513,6 +513,24 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://support.amd.com/it/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.nvidia.it/Download/index.aspx?lang=it
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -1548,10 +1566,13 @@ Vuoi cancellare quell&apos;elemento?
 		Impossibile offrire l&apos;amicizia in questo momento. Riprova fra poco.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		È stata impostata la modalità Non disponibile.
-La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino.
-		<usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Non disturbare è attivo.  Non riceverai la notifica delle comunicazioni in arrivo.
+
+- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze &gt; Generali).
+- Le offerte di teleport verranno rifiutate.
+- Le chiamate voce verranno rifiutate.
+		<usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l&apos;offerta.
@@ -2039,6 +2060,10 @@ Trasferisci gli elementi nell&apos;inventario?
 		Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account?
 		<usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione.  Tutti i partecipanti riceveranno notifiche per la nuova conversazione.
+		<usetemplate ignoretext="Conferma l&apos;aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Confermi di voler uscire?
 		<usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/>
@@ -2113,14 +2138,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 			<button ignore="Never Replace" name="No" text="Annulla"/>
 		</form>
 	</notification>
-	<notification label="Avviso di &apos;Occupato&apos;" name="BusyModePay">
-		Sei in modalità &apos;Occupato&apos;, ciò significa che non riceverai ciò che attendi per questo pagamento.
+	<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
+		Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
 
-Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
+Vuoi disattivare la modalità Non disturbare prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="OK"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Abbandona"/>
+			<ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/>
+			<button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/>
+			<button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2255,11 +2280,8 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 	<notification name="GroupNotice">
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
@@ -2487,13 +2509,6 @@ Qui non puoi volare.
 	<notification name="DynamicPathfindingDisabled">
 		Il pathfinding dinamico non è attivato in questa regione.  Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento.  Per fare in modo che gli oggetti in movimento si comportino correttamente, fai clic sul pulsante &quot;Rebake regione&quot;.  Per maggiori informazioni, seleziona la guida
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Guida" ignoretext="Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Si è verificato un errore.  Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione.  A volte il problema viene risolto uscendo ed eseguendo nuovamente l&apos;accesso.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2754,9 +2769,9 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+		Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
   
-Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
+Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
 			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
@@ -3338,4 +3353,633 @@ Tentativo annullato.
 		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
 		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelato.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] ti ha scongelato.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar scongelato.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		La congelazione non ha avuto successo perché non hai le autorizzazioni dell&apos;amministratore per quel lotto.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Non sei più congelato, puoi continuare.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Non puoi congelare quell&apos;utente.
+	</notification>
+	<notification name="NowOwnObject">
+		Sei ora il proprietario dell&apos;oggetto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Non puoi rezzare l&apos;oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno.  Usa lo strumento terreno per visualizzare a chi appartiene il terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Oggetto non razzato perché ci sono troppe richieste.
+	</notification>
+	<notification name="SitFailCantMove">
+		Non puoi sederti perché al momento non puoi muoverti.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Non puoi sederti perché non ti è consentito entrare in quel terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Proba ad avvicinarti.  Non puoi sederti su un oggetto perché
+non è nella stessa regione in cui ti trovi.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Impossibile creare il nuovo oggetto. La regione è piena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Non puoi creare alberi ed erba su terreni che non sono di tua proprietà.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Copia non riuscita perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; non può essere trasferito a te.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; contribuisce al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicato senza oggetto principale selezionato.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossibile duplicare gli oggetti perché la regione è piena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Impossibile creare l&apos;oggetto perché 
+il lotto è pieno.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Tentativo di rezzare un oggetto non riuscito.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossibile creare un oggetto che ha causato problemi in questa regione.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		L&apos;oggetto dell&apos;inventario è stato aggiunto alla blacklist.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Ricerca terreno bloccata.
+Hai eseguito troppe ricerche terreno in un breve tempo.
+Riprova tra un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sei deceduto e sei stato teleportato alla tua posizione iniziale
+	</notification>
+	<notification name="EjectComingSoon">
+		Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Non puoi entrare in questa regione perché 
+il server è pieno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Opzione Salva nell&apos;inventario disattivata
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché l&apos;oggetto da cui è stato razzato non esiste più.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossibile riportare &apos;[OBJ_NAME]&apos; nell&apos;inventario -- questa operazione è stata disattivata.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Non puoi copiare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La rimozione dell&apos;oggetto &apos;[OBJ_NAME]&apos; dal simulatore non è consentita dal sistema delle autorizzazioni.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Non puoi salvare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Non puoi salvare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere copiato.
+	</notification>
+	<notification name="NoModNoTaking">
+		Non puoi prendere l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Errore interno: Tipo di destinazione sconosciuto.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Cancellazione non riuscita perché l&apos;oggetto non è stato trovato.
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Non puoi espellere quell&apos;utente.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="HomePositionSet">
+		Posizione di base impostata.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar espulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		L&apos;espulsione non ha avuto successo perché non hai l&apos;autorizzazione dell&apos;amministratore del lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l&apos;oggetto su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché nell&apos;altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Non hai l&apos;autorizzazione necessaria per modificare questa immagine
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossibile attivare la fisica per oggetti keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossibile attivare la fisica per l&apos;oggetto -- risorse di terreno insufficienti.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Aggiunta elemento non riuscita
+	</notification>
+	<notification name="UnableEditItem">
+		Impossibile modificare questo elemento.
+	</notification>
+	<notification name="NoPermToEdit">
+		Non sei autorizzato a modificare questo elemento.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Non ti è permesso copiare quell&apos;inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossibile salvare i contenuti dell&apos;oggetto: L&apos;elemento non esiste più.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossibile salvare i contenuti dell&apos;oggetto: Nell&apos;inventario esiste già un elemento con quel nome.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossibile salvare i contenuti dell&apos;oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
+	</notification>
+	<notification name="TooManyScripts">
+		Troppi script.
+	</notification>
+	<notification name="UnableAddScript">
+		Aggiunta script non riuscita.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Il server degli asset non ha inviato una risposta entro il tempo massimo.  Oggetto restituito al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In questa regione non sono attivate le forme per la fisica.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossibile impostare le proprietà della fisica per quel tipo di oggetto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		impossibile impostare un prim principale senza forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In questa regione non sono attivati i materiali per la fisica.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		I materiali per la fisica possono essere modificati solo i prim principali.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		L&apos;impostazione dei materiali per la fisica nei caratteri non è ancora supportata.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Almeno una delle proprietà dei materiali per la fisica non è valida.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Non puoi alterare il tipo di punto di un oggetto con reticolo
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Non puoi alterare la forma di un oggetto con reticolo
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Non puoi entrare in questa regione perché è piena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Collegamento non riuscito -- i proprietari non corrispondono
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Collegamento non riuscito -- troppe primitive.
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Collegamento non riuscito -- niente di collegabile.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Collegamento non riuscito -- troppi personaggi con pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Collegamento non riuscito -- risorse terreno non sufficienti
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		L&apos;oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sei stato teleportato nella posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos; del lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sei stato teleportato nella tua posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di un utente sconosciuto.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Impossibile creare l&apos;oggetto richiesto. La regione è piena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Non puoi collegare più oggetti a un singolo luogo.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Non puoi creare oggetti multipli in questa posizione.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Impossibile creare l&apos;oggetto richiesto. L&apos;oggetto non è presente nel database.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Impossibile creare l&apos;oggetto richiesto. Tempo scaduto per la richiesta. Riprova.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Impossibile creare l&apos;oggetto richiesto. Riprova.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Rezzing non riuscito. Il caricamento dell&apos;oggetto richiesto è durato troppo a lungo.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Non puoi creare piante su questo terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossibile ripristinare l&apos;oggetto. Nessuna posizione trovata nel mondo virtuale.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossibile rezzare l&apos;oggetto perché i dati del reticolo non sono validi.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossibile rezzare l&apos;oggetto perché ci sono già troppi script in questa regione.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione.
+	</notification>
+	<notification name="CantCreateObject">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parametri oggetto non validi
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione.
+	</notification>
+	<notification name="CantChangeShape">
+		Non ti è consentito modificare questa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Assegnazione non riuscita perché non hai l&apos;autorizzazione necessaria per assegnare oggetti per il tuo gruppo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossibile collegare l&apos;oggetto perché un avatar è seduto sopra.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Alberi ed erba non possono essere indossati come collegati.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossibile collegare oggetti di proprietà di un gruppo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Non puoi collegare oggetti che non sono di tua proprietà.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossibile collegare oggetti che contribuiscono a navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		L&apos;oggetto non può essere collegato perché non sei autorizzato a muoverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Non puoi lasciare elementi collegati con reticolo. Separa nell&apos;inventario e quindi rezza nel mondo virtuale.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Impossibile rimuovere l&apos;elemento collegato: non hai l&apos;autorizzazione necessaria per rimuoverlo qui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Impossibile rimuovere l&apos;elemento collegato: risorse terreno disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Non puoi lasciare l&apos;oggetto qui.  Il lotto è pieno.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Limita i parametri per la cancellazione.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Impossibile caricare l&apos;asset.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Utente da teleportare alla posizione iniziale non trovato
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		richiesta superpoteri non riuscita
+	</notification>
+	<notification name="GenericRequestFailed">
+		richiesta generica non riuscita
+	</notification>
+	<notification name="CantUploadPostcard">
+		Impossibile caricare la cartolina.  Riprova più tardi.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		I dettagli dell&apos;inventario per la notifica di gruppo non sono stati trovati.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossibile inviare la notifica di gruppo -- non consentita.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossibile inviare la notifica di gruppo -- impossibile costruire l&apos;inventario.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossibile analizzare l&apos;inventario nella notifica.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Caricamento terreno non riuscito.
+	</notification>
+	<notification name="TerrainFileWritten">
+		File terreno scritto.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		File terreno generato, avvio del download...
+	</notification>
+	<notification name="TerrainBaked">
+		Baking terreno completata.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Devi aggiornare il Viewer per poter acquistare questo lotto.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Impossibile acquistare, questo lotto non è in vendita.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Impossibile acquistare. Il prezzo o l&apos;area del terreno sono stati cambiati.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Non sei l&apos;acquirente autorizzato di questo lotto.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Non puoi acquistare questo lotto perché è in attesa di autorizzazione all&apos;acquisto
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		hai selezionato terreni con proprietari diversi. Seleziona un&apos;area più piccola e riprova.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Non sono stati selezionati abbastanza lotti affittati da collegare.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -&gt; Segnala bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Impossibile suddividere il terreno. È stato selezionato l&apos;intero lotto.\nProva a selezionare un pezzo di terreno più piccolo.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Il terreno è stato diviso.
+	</notification>
+	<notification name="PassPurchased">
+		Hai acquistato un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Nella regione non sono permessi gli annunci pubblicitari.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Il tuo pass per questo terreno è quasi scaduto.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Nessuna superficie adatta a sedersi, prova un altro luogo.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Non c&apos;è posto per sedersi, prova un altro luogo.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai l&apos;autorizzazione necessaria.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Non puoi assegnare terreno di proprietà di un gruppo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		L&apos;acquisto dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		L&apos;acquisto dell&apos;inventario non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Non hai abbastanza L$ per acquistare un pass per questo terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Al momento non puoi acquistare un pass.  Riprova più tardi.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Impossibile creare l&apos;oggetto perché il lotto è pieno.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossibile creare il punto di riferimento per l&apos;evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		I tuoi superpoteri hanno interrotto la congelazione.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Richiesta di poteri speciali non riuscita. La richiesta è stata registrata.
+	</notification>
+	<notification name="ExpireExplanation">
+		Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta.
+	</notification>
+	<notification name="DieExplanation">
+		Il sistema non è in grado di elaborare la tua richiesta.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Denaro insufficiente per creare una primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Denaro insufficiente per creare un oggetto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Posizione iniziale ripristinata perché non era valida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="SetHomePosition">
+		Posizione di base impostata.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossibile derazzare l&apos;oggetto a causa di un errore nell&apos;inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Impossibile creare l&apos;inventario richiesto.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Impossibile creare la cartella dell&apos;inventario richiesta.
+	</notification>
+	<notification name="CantCreateInventory">
+		Impossibile creare quell&apos;inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Impossibile creare il punto di riferimento.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Il vestiario non può essere creato in questo momento. Riprova tra un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventario non è in vendita.
+	</notification>
+	<notification name="CantFindInvItem">
+		Impossibile trovare l&apos;elemento nell&apos;inventario.
+	</notification>
+	<notification name="CantFindObject">
+		Impossibile trovare l&apos;oggetto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Non si capisce chi deve essere pagato.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Non puoi dare L$ a oggetti pubblici.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Creazione inventario non riuscito per un oggetto nel mondo virtuale.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un errore interno ha impedito l&apos;aggiornamento del Viewer.  Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Non puoi creare prim grandi che intersecano altri giocatori.  Riprova quando gli altri giocatori si sono spostati.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file.
+		<usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L&apos;elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati.
+		<usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossibile spostare i file. Il percorso precedente è stato ripristinato.
+		<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index ede19b9e5a..cfceb5b982 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
 	<icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
index 610f561a65..7ca2d3b57b 100644
--- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Blocca lista
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
-	<button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/>
-	<button label="Blocca l&apos;oggetto per nome..." label_selected="Blocca l&apos;oggetto per nome..." name="Block object by name..."/>
-	<button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/>
+		<menu_button name="view_btn" tool_tip="Opzioni Ordina"/>
+		<menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/>
+		<button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ca6b65300a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(caricamento in corso)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..624eaa639c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/>
+	<icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/>
+	<button name="delete_btn" tool_tip="Elimina questo elemento"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
index 7cdc4c7ff6..72e644008c 100644
--- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Sconosciuto"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index f903ae6e2c..e1468db76e 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -14,81 +14,53 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_filtered_friends_msg">
 		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
-	<string name="people_filter_label" value="Filtro persone"/>
-	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtro persone" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
-		<panel label="I MIEI AMICI" name="friends_panel">
+		<panel label="AMICI" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtro persone" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="I MIEI GRUPPI" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
-				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
+		<panel label="GRUPPI" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtro gruppi" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/>
+				<menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
+				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtro persone" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
+		<panel label="BLOCCATO" name="blocked_panel">
+			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 0c9c4027e5..c2ac6e97a9 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<text name="font_size">
-		Dimensioni caratteri:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Piccola" name="radio" value="0"/>
-		<radio_item label="Media" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
-	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
-	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
-	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostra gli IM in:
-	</text>
-	<text name="requires_restart_label">
-		(richiede il riavvio)
-	</text>
-	<radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)">
-		<radio_item label="Finestre separate" name="radio" value="0"/>
-		<radio_item label="Schede" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Attiva popup per chat in arrivo:
-	</text>
-	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
-	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
-	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
-	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Dimensioni caratteri:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Piccolo" name="Small" value="0"/>
+			<item label="Medio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notifiche
+		</text>
+		<text name="friend_ims">
+			IM degli amici:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM non di amici:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM conferenza:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat di gruppo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat nei dintorni:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Riproduci suono:
+		</text>
+		<check_box label="Nuova conversazione" name="new_conversation"/>
+		<check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/>
+		<check_box label="Offerta di Teleport" name="teleport_offer"/>
+		<check_box label="Offerta inventario" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Cancella registro..." name="clear_log"/>
+		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
+		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
+	</panel>
 	<button label="Traduzione..." name="ok_btn"/>
 	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
 	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 90a833471c..45cc06c2ea 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="mai" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Risposta in modalità occupato:
+		Risposta Non disturbare:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 8a0f93e650..5f912dd126 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Acquista oggetto" name="Buyobject"/>
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
+			<combo_box.item label="Ingrandisci" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index fb1e387468..f95318542b 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=it-IT&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
@@ -616,8 +616,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AvatarAway">
 		Assente
 	</string>
-	<string name="AvatarBusy">
-		Occupato
+	<string name="AvatarDoNotDisturb">
+		Non disturbare
 	</string>
 	<string name="AvatarMuted">
 		Mutato
@@ -853,6 +853,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ST_NO_JOINT">
 		Impossibile trovare ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat nei dintorni
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat nei dintorni)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -916,6 +922,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
+	<string name="AgentNameSubst">
+		(Tu)
+	</string>
 	<string name="TeleportYourAgent">
 		Teleportarti
 	</string>
@@ -1000,18 +1009,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="dictionary_files">
 		Dizionari
 	</string>
-	<string name="AvatarSetNotAway">
-		Imposta come non assente
-	</string>
-	<string name="AvatarSetAway">
-		Imposta come assente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Imposta come non occupato
-	</string>
-	<string name="AvatarSetBusy">
-		Imposta come occupato
-	</string>
 	<string name="shape">
 		Figura corporea
 	</string>
@@ -1968,8 +1965,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="PanelContentsNewScript">
 		Nuovo script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
+	<string name="DoNotDisturbModeResponseDefault">
+		Questo residente ha attivato la modalità &apos;Non disturbare&apos; e vedrà il tuo messaggio più tardi.
 	</string>
 	<string name="MuteByName">
 		(In base al nome)
@@ -2082,9 +2079,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenuto
-	</string>
 	<string name="AcquiredItems">
 		Oggetti acquisiti
 	</string>
@@ -3799,7 +3793,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Regione generale
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visibili e chat consentita fuori di questo lotto
+		Gli avatar in questo lotto non possono essere visti o sentiti da avatar all&apos;esterno del lotto
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione.
@@ -3876,6 +3870,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Per vedere questo messaggio, devi deselezionare &apos;Solo amici e gruppi possono chiamarmi o mandarmi IM&apos; in Preferenze/Privacy.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
@@ -3885,6 +3885,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Ti sei collegato alla chiamata in voce
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità &apos;Non disturbare&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] ha iniziato una chiamata vocale
 	</string>
@@ -3897,6 +3900,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Chiusa la chiamata
 	</string>
+	<string name="conference-title">
+		Chat con più persone
+	</string>
 	<string name="conference-title-incoming">
 		Chiamata in conferenza con [AGENT_NAME]
 	</string>
@@ -4769,6 +4775,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversazioni
+	</string>
 	<string name="Command_Compass_Label">
 		Bussola
 	</string>
@@ -4844,6 +4853,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Tooltip">
 		Chatta con persone vicine usando il testo
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversa con chiunque
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bussola
 	</string>
@@ -4973,4 +4985,13 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
new file mode 100644
index 0000000000..98b1a59a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="会話ログ">
+	<panel name="buttons_panel">
+		<filter_editor label="人をフィルター" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ea0b23de48
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="会話:">
+	<floater.string name="Title">
+		会話:[NAME]
+	</floater.string>
+	<text name="page_label" value="ページ"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index 06b65e27f0..a155efdc1e 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="会話"/>
+<multi_floater name="floater_im_box" title="会話">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
+					<button name="add_btn" tool_tip="新しい会話を開始"/>
+					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
+					<text name="stub_textbox">
+						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index dfa1c85ca2..a44c843df7 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="宛先" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
+	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
+	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
+	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
+				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
+				<button name="close_btn" tool_tip="この会話を終了する"/>
+				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="宛先" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index f152fcd738..308f6f9a3d 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		匿名ユーザー
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		がコールしています。
+		からコールを受けています。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		がコンファレンスチャットで、ボイスチャットに参加しました。
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
+		コールに応答すると、現在のボイスチャットから切断されます。
 	</text>
-	<button label="はい" label_selected="はい" name="Accept"/>
-	<button label="いいえ" label_selected="いいえ" name="Reject"/>
-	<button label="IM" name="Start IM"/>
+	<button label="取る" label_selected="取る" name="Accept"/>
+	<button label="無視" label_selected="無視" name="Reject"/>
+	<button label="代わりに IM を開く" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index ec107f3e6b..9733c61918 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				表示：
 			</text>
-			<check_box label="世界" name="show_world"/>
+			<check_box label="テスト" name="show_world"/>
 			<check_box label="可動物のみ" name="show_world_movables_only"/>
 			<check_box label="ナビメッシュ" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 3773812bb6..37233d3e68 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="ライブプレビュー" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="プレビュー無効"/>
 	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
 	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..44e96c35ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ボイスチャットの音量">
+	<slider label="ボイスチャット" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index ee675e143b..b38ea9331a 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィング">
+<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
 	<string name="no_voice_effect">
 		（ボイスモーフィングなし）
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
new file mode 100644
index 0000000000..a380615d5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ボイス音量">
+	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index a071abbd2e..07bcefd9b3 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
new file mode 100644
index 0000000000..c7df20d252
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="会話を終える" name="close_conversation"/>
+	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
+	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="フレンドを追加" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+	<menu_item_call label="グループ情報" name="group_profile"/>
+	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
+	<menu_item_call label="グループから脱退する" name="leave_group"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
+		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..c9d4f947a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="ボイスコール..." name="Call"/>
+	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="Invite"/>
+	<menu_item_call label="地図" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..bd4812603f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
+	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
new file mode 100644
index 0000000000..55cd6610f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..222a741718
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="簡略表示" name="compact_view"/>
+	<menu_item_check label="詳細表示" name="expanded_view"/>
+	<menu_item_check label="時間を表示" name="IMShowTime"/>
+	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 8c4f328661..6448e9244e 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
 	<menu_item_call label="ブロック..." name="Block"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
+	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 2bcbe1915b..1969ae2a10 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="髪" name="New Hair"/>
 		<menu_item_call label="目" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="フォルダをすべて開く" name="expand"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
new file mode 100644
index 0000000000..5816351d9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
+	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
+	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
+	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
+	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
+	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
+	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
+	<menu_item_check label="会話ログ..." name="Conversation"/>
+	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
+	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..b5c9d11e02
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_call label="プロフィール..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..3e74b2ddff
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
+	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..4b86a353f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
new file mode 100644
index 0000000000..b95d11fdbd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
+	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 842d79dc4b..2c0c85ba28 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="ボイスコール" name="Call"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
new file mode 100644
index 0000000000..4a9e402fa4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 8d84b0e521..972ab767bf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールの表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index 3f20e5d3ab..fe85e278cf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="Add Friends"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friends"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="コール" name="call"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..b7cccc4396
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="地図を表示" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
new file mode 100644
index 0000000000..feaeba4398
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 92d118a5ae..72722db7cc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
+	<menu_item_call label="プロフィールを表示" name="show_agent"/>
+	<menu_item_call label="IM を送信..." name="send_im"/>
+	<menu_item_call label="フレンドを追加..." name="add_friend"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index d6a048dcfc..9e340e3239 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
+	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index e60e6781c6..6f650242b4 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="ログイン" name="Status">
-			<menu_item_call label="一時退席中" name="Set Away"/>
-			<menu_item_call label="取り込み中" name="Set Busy"/>
-		</menu>
+		<menu label="ログイン" name="Status"/>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
 		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
 		<menu_item_call label="マイアカウント..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="チャット..." name="Nearby Chat"/>
+		<menu_item_check label="会話..." name="Conversations"/>
+		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
-		<menu_item_check label="ボイス設定..." name="Nearby Voice"/>
-		<menu_item_check label="ボイスモーフィング..." name="ShowVoice"/>
+		<menu label="ボイスモーフィング" name="VoiceMorphing">
+			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
+			<menu_item_check label="プレビュー..." name="Preview"/>
+			<menu_item_call label="申し込む..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_call label="フレンド" name="My Friends"/>
-		<menu_item_call label="グループ" name="My Groups"/>
-		<menu_item_call label="近くにいる人" name="Active Speakers"/>
+		<menu_item_check label="フレンド" name="My Friends"/>
+		<menu_item_check label="グループ" name="My Groups"/>
+		<menu_item_check label="近くにいる人" name="Active Speakers"/>
 		<menu_item_call label="リストをブロック" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="買う" name="Menu Object Buy"/>
 			<menu_item_call label="取る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
-			<menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="オプション" name="Options">
 			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="ハウツー..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
+		<menu_item_call label="ユーザーガイド" name="User’s guide"/>
+		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
+		<menu_item_call label="日本語サポートページ" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
 		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
@@ -385,9 +393,14 @@
 				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
 				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="アニメーションのスピード" name="Animation Speed">
+				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
+				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
+				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
+				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
 			<menu_item_check label="アニメーション情報" name="Animation Info"/>
-			<menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
 			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
 			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
 			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index d5cff18a24..356506f191 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -538,6 +538,24 @@ L$ が不足しているのでこのグループに参加することができ
 		</url>
 		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -1582,10 +1600,13 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		現在フレンドシップを送れません。数分後にもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		取り込み中モードになりました。
-チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
-		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		「通知を受けない」がオンになります。着信通信はあなたには通知されません。
+
+- 他の住民は「通知を受けない」の応答（「設定」&gt;「一般」で設定）を受け取ることになります。
+- テレポートのオファーはすべて受け取り拒否となります。
+- ボイスコールは拒否されます。
+		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
@@ -2076,6 +2097,10 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		終了しようとしています。続けますか？
 		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
@@ -2153,14 +2178,14 @@ Linden Lab
 			<button ignore="交換しない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
-	<notification label="取り込み中の警告" name="BusyModePay">
-		現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。
+	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
+		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
 
-この取引を行うために「取り込み中」の設定を解除しますか？
+このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/>
-			<button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/>
-			<button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/>
+			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
+			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
+			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2296,11 +2321,8 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="GroupNotice">
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオンラインです
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオフラインです
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2530,13 +2552,6 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="DynamicPathfindingDisabled">
 		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。移動オブジェクトを正しく動作させるには、「地域の再構築」ボタンをクリックします。詳しい情報は見るには「ヘルプ」を選択してください。
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="ヘルプ" ignoretext="この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。" name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2797,9 +2812,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		警告：オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
+		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
   
-このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
+そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
 		<form name="form">
 			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
@@ -3378,4 +3393,627 @@ M キーを押して変更します。
 		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
 		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		アバターがフリーズされています。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] によってフリーズが解除されています。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		アバターのフリーズが解除されました。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		その区画の管理権限を持っていないため、フリーズに失敗しました。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		フリーズ期間が切れました。仕事に戻ってください。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		残念ながら、そのユーザーをフリーズできません。
+	</notification>
+	<notification name="NowOwnObject">
+		これで、オブジェクト [OBJECT_NAME] の所有者になりました
+	</notification>
+	<notification name="CantRezOnLand">
+		この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		リクエストが多すぎて、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="SitFailCantMove">
+		今回移動できなかったため、座ることができません。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		その土地に対して許可を受けていないため、座ることができません。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		新しいオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		所有していない土地に木や草を植えることはできません。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーする権限がないため、コピーに失敗しました。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をあなたに転送できないため、コピーに失敗しました。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; がナビメッシュに貢献しているため、コピーに失敗しました。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		ルートオブジェクトを選択せずに複製します。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		リージョンが埋まっているため、オブジェクトのコピーを作成することができません。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		区画がいっぱいのため、
+オブジェクトを作成できません。
+	</notification>
+	<notification name="RezAttemptFailed">
+		オブジェクトへの Rez の試みに失敗しました。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		このリージョンで問題を引き起こすアイテムは作成できません。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		その持ち物アイテムはブラックリストに登録されています。
+	</notification>
+	<notification name="NoCanRezObjects">
+		現在あなたにはオブジェクトを作成するための許可がありません。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地の検索がブロックされました。
+短期間に多くの土地を検索したためです。
+しばらくしてから再度お試しください。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		死んでしまったので、ホームにテレポートされました。
+	</notification>
+	<notification name="EjectComingSoon">
+		ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。
+	</notification>
+	<notification name="NoEnterServerFull">
+		サーバーが埋まっているため、
+このリージョンに入場することはできません。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「「持ち物」に保存」が無効になっています。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		オブジェクト &apos;[DEST_NAME]&apos; を修正する権限がないため、オブジェクトのコンテンツに &apos;[OBJ_NAME]&apos; を保存できません。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		インベントリに &apos;[OBJ_NAME]&apos; を保存することはできません - この操作が無効になっています。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		シミュレータからのオブジェクト &apos;[OBJ_NAME]&apos; の削除は、権限システムによって無効にされています。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーできないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoModNoTaking">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを取得できません。
+	</notification>
+	<notification name="RezDestInternalError">
+		内部エラー: 不明な宛先タイプ。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		オブジェクトが見つからないため削除できませんでした。
+	</notification>
+	<notification name="SorryCantEjectUser">
+		残念ながら、そのユーザーを追放することはできません。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="HomeLocationLimits">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="HomePositionSet">
+		家の配置の設定。
+	</notification>
+	<notification name="AvatarEjected">
+		アバターが追放されました。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		その区画の管理権限がないため、追放できませんでした。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		区画が埋まっているため、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		オブジェクト &apos;[OBJECT_NAME]&apos; は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		この区画でこのオブジェクトのリソースが不足しているため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		不明な理由により、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		そのオブジェクトを変更する権限がありません
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		キーフレームオブジェクトのために物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		土地のリソースが足りないため、オブジェクトの物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+	</notification>
+	<notification name="UnableAddItem">
+		アイテムを追加できません!
+	</notification>
+	<notification name="UnableEditItem">
+		これは編集できません!
+	</notification>
+	<notification name="NoPermToEdit">
+		これを編集する許可がありません。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		そのインベントリをコピーすることは許可されません。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。
+	</notification>
+	<notification name="TooManyScripts">
+		スクリプトが多すぎます。
+	</notification>
+	<notification name="UnableAddScript">
+		テキストを追加できません!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		このリージョンでは、物理的シェイプが有効にされていません。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		そのオブジェクトタイプの物理的プロパティを設定できません。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		ルートプリムを設定できないため、シェイプがありません。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		このリージョンでは、物理的素材が有効にされていません。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		物理的素材を調整できるのは、ルートプリムだけです。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		キャラクターへの物理的素材の設定はまだサポートされていません。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定した物理的素材のプロパティが 1 つ以上無効です。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		メッシュオブジェクトの縫い目のタイプを変更することはできません。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		メッシュオブジェクトの形状を変更することはできません
+	</notification>
+	<notification name="FullRegionCantEnter">
+		リージョンが埋まっているため、\nこのリージョンに入場できません。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		リンクエラー -- 所有者が違います
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		リンクエラー -- 編集権限がありません。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		リンクエラー -- プリミティブが多すぎます。
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		リンクエラー -- コピーなしと転送なしをリンクできません。
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		リンクエラー -- リンクできるものがありません。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		リンクエラー -- パスファインディングの文字数が多すぎます
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		リンクエラー -- 土地のリソースが足りません
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはホームにテレポートされました。
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		​オブジェクト ​&apos;[OBJECT_NAME]&apos; によって、あなたはホームへテレポートされています。
+	</notification>
+	<notification name="TeleportedByAttachment">
+		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		[OWNER_ID] が所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		不明なユーザーが所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		1 つの場所に複数のオブジェクトを着用することはできません。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		ここでは、複数のオブジェクトを作成することはできません。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		要求されたオブジェクトを作成できません。もう一度お試しください。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		この土地に木を植えることはできません。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		オブジェクトをリストアできません。ワールドの位置が見つかりません。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		メッシュデータが無効なため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		現在のアクセス権限では、そこにオブジェクトを作成できません。
+	</notification>
+	<notification name="CantCreateObject">
+		現在あなたにはオブジェクト作成する許可がありません。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無効なオブジェクトパラメーター
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+	</notification>
+	<notification name="CantChangeShape">
+		あなたにはこのシェイプを変更する許可がありません。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		現在のアクセス権限では、ここにオブジェクトを取得できません。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		現在のアクセス権限では、ここでオブジェクトを購入できません。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		木や草をアタッチメントとして着用できません。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		グループが所有しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		所有していないオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		ナビメッシュに貢献しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		ここにオブジェクトをドロップできません。区画が埋まっています。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		削除パラメーターを絞ってください。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		資産をアップロードできません。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		ホームをテレポートするユーザーが見つかりませんでした。
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		過剰なリクエストが失敗しました
+	</notification>
+	<notification name="GenericRequestFailed">
+		一般的なリクエストに失敗しました
+	</notification>
+	<notification name="CantUploadPostcard">
+		ポストカードをアップロードできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		グループ通知のインベントリの詳細を取得できません。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		グループ通知の送信が許可されないため、送信できません。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		グループ通知を送信できません。持ち物を作成することもできません。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		通知内の持ち物を検出できません。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形のアップロードに失敗しました。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形ファイルが書き込まれました。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形ファイルを書き出し、ダウンロードを開始しています...
+	</notification>
+	<notification name="TerrainBaked">
+		地形がベークされました。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		この区画を購入するには、ビューワをアップデートする必要があります。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		購入することができません。この区画は販売対象ではありません。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		販売価格または土地の面積が変わったため、購入できません。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		あなたはこの区画の委任された買い手ではありません。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		すでに購入の認証を待機しているため、この区画を購入できません。
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		選択範囲のリース区画の数が少ないため、参加できません。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		土地を分解できません。\n区画が見つかりません。\n「Help」&gt;「Reprt Bug...」でレポートを行ってください。
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地が分割されています。
+	</notification>
+	<notification name="PassPurchased">
+		入場許可を購入しました。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		リージョンでは、クラシファイド広告を許可しません。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		この土地への入場許可はまもなく期限が切れます。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		配置に適した表面がありません。別の場所を試してみたください。
+	</notification>
+	<notification name="CantSitNoRoom">
+		ここには座る余地がありません。他の場所を試してください。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		権限がないため、オブジェクトを取得できませんでした。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		グループ所有の土地は、譲渡できません。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		リンデンドルが不足しているため、インベントリを購入できませんでした。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		リンデンドルが足りないため、この土地への入場許可を購入できません。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		今すぐには入場許可を購入できません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		区画が埋まっているため、オブジェクトを\n作成することができません。
+	</notification>
+	<notification name="FailedPlacingObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		イベントのためのランドマークを作成することができません。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		強力な力でフリーズを解除します。
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+	</notification>
+	<notification name="ExpireExplanation">
+		システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+	</notification>
+	<notification name="DieExplanation">
+		システムは、あなたのリクエストを処理できません。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		プリミティブ広告を出すには、資金が足りません。
+	</notification>
+	<notification name="RezObjectFailure">
+		資金が足りないため、オブジェクトを作成できません。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		ホームが不正なため、ホームの位置をリセットします。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="SetHomePosition">
+		家の配置の設定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		インベントリエラーのため、オブジェクトの Rez 解除ができません。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		リクエストされたインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		リクエストされた持ち物フォルダーを作成できません。
+	</notification>
+	<notification name="CantCreateInventory">
+		そのインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateLandmark">
+		ランドマークを作成できません。
+	</notification>
+	<notification name="CantCreateOutfit">
+		アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+	</notification>
+	<notification name="InventoryNotForSale">
+		インベントリは販売対象ではありません。
+	</notification>
+	<notification name="CantFindInvItem">
+		持ち物アイテムを見つけることができません。
+	</notification>
+	<notification name="CantFindObject">
+		オブジェクトが見つかりません。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		オブジェクトへの送金は、このリージョンでは現在無効にされています。
+	</notification>
+	<notification name="CantPayNoAgent">
+		支払いの相手を把握できませんでした。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		パブリックオブジェクトにリンデンドルを与えることはできません。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		インワールドオブジェクトでのインベントリ作成に失敗しました。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
+		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		ファイルを移動できません。以前のパスがリストアされました。
+		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 70d37c3bad..3ef8eba19f 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
 	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
 	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 5d6a6065ae..9263e5f347 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		ブロックリスト
-	</text>
-	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
-	<button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
-	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
-	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="フィルター" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
+		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
+		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
+		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..09ffb92d36
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（ローディング）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..e05a67e31d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
+	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
+	<button name="delete_btn" tool_tip="このエントリーを削除"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 4b548049c8..77d3d8f391 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="不明"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 88c31451b5..03ce87537a 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人" name="people_panel">
 	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
 	</string>
-	<string name="people_filter_label" value="人をフィルター"/>
-	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
-		<panel label="マイ フレンド" name="friends_panel">
+		<panel label="フレンド" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人をフィルター" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="マイ グループ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
-				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
+		<panel label="グループ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
+				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人をフィルター" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
+		<panel label="停止" name="blocked_panel">
+			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index b6e344ca48..ae5391c7bd 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<text name="font_size">
-		文字の大きさ：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
-	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IM の表示方法：
-	</text>
-	<text name="requires_restart_label">
-		（再起動後に反映）
-	</text>
-	<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）">
-		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
-		<radio_item label="タブ" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		受信チャットのポップアップを有効にする
-	</text>
-	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
-	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
-	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
-	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			文字の大きさ：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小規模" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大規模" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			通知
+		</text>
+		<text name="friend_ims">
+			フレンド IM:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			非フレンド IM:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			コンファレンス IM:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			グループチャット:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="なし" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			近くのチャット:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			すべての通知を一時的に受け付けないようにするには、「コミュニケート」&gt;「通知を受けない」を使用します。
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			音の再生:
+		</text>
+		<check_box label="新しい会話" name="new_conversation"/>
+		<check_box label="ボイスコールの着信" name="incoming_voice_call"/>
+		<check_box label="テレポートを渡す" name="teleport_offer"/>
+		<check_box label="アイテムのオファー" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="ログのクリア..." name="clear_log"/>
+		<button label="テキストの削除..." name="delete_transcripts"/>
+		<button label="参照..." label_selected="参照" name="log_path_button"/>
+	</panel>
 	<button label="他の言語..." name="ok_btn"/>
 	<button label="自動置換..." name="autoreplace_showgui"/>
 	<button label="スペルチェック中..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 91e1514e49..d70af7e099 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="一時退席設定なし" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		取り込み中モード時の返事：
+		「通知を受けない」応答:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index c61c73657f..4f65c8477b 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
+			<combo_box.item label="ズーム" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 50697e5500..b27904c4d7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ja-JP&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
@@ -622,8 +622,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="AvatarAway">
 		一時退席中
 	</string>
-	<string name="AvatarBusy">
-		取り込み中
+	<string name="AvatarDoNotDisturb">
+		通知を受けない
 	</string>
 	<string name="AvatarMuted">
 		ブロック中
@@ -859,6 +859,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ST_NO_JOINT">
 		ROOT または JOINT が見つかりません
 	</string>
+	<string name="NearbyChatTitle">
+		近くのチャット
+	</string>
+	<string name="NearbyChatLabel">
+		(近くのチャット)
+	</string>
 	<string name="whisper">
 		のささやき:
 	</string>
@@ -922,12 +928,15 @@ support@secondlife.com にお問い合わせください。
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
-	<string name="TeleportYourAgent">
-		あなたをテレポート
-	</string>
 	<string name="NotConnected">
 		接続されていません
 	</string>
+	<string name="AgentNameSubst">
+		(あなた)
+	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1009,18 +1018,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="dictionary_files">
 		辞書
 	</string>
-	<string name="AvatarSetNotAway">
-		一時退席中解除
-	</string>
-	<string name="AvatarSetAway">
-		一時退席中
-	</string>
-	<string name="AvatarSetNotBusy">
-		取り込み中解除
-	</string>
-	<string name="AvatarSetBusy">
-		取り込み中
-	</string>
 	<string name="shape">
 		シェイプ
 	</string>
@@ -1989,8 +1986,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
-	<string name="BusyModeResponseDefault">
-		メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。  あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
+	<string name="DoNotDisturbModeResponseDefault">
+		この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。
 	</string>
 	<string name="MuteByName">
 		（名称別）
@@ -2103,9 +2100,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDate">
 		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		内容
-	</string>
 	<string name="AcquiredItems">
 		取得アイテム
 	</string>
@@ -3877,7 +3871,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		General リージョン
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		この区画外にアバターを見えるようにして、チャットも許可
+		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
@@ -3954,6 +3948,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="IM_unblock_only_groups_friends">
 		このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。
 	</string>
+	<string name="OnlineStatus">
+		オンライン
+	</string>
+	<string name="OfflineStatus">
+		オフライン
+	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
@@ -3963,6 +3963,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="you_joined_call">
 		ボイスコールに参加しました
 	</string>
+	<string name="you_auto_rejected_call-im">
+		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
+	</string>
 	<string name="name_started_call">
 		[NAME] はボイスコールを開始します
 	</string>
@@ -3979,7 +3982,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		接続中...
 	</string>
 	<string name="conference-title">
-		アドホックコンファレンス
+		複数人チャット
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] とコンファレンスする
@@ -4859,6 +4862,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Label">
 		チャット
 	</string>
+	<string name="Command_Conversations_Label">
+		会話
+	</string>
 	<string name="Command_Compass_Label">
 		コンパス
 	</string>
@@ -4934,6 +4940,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Tooltip">
 		近くの人と文字チャットする
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		全員との会話
+	</string>
 	<string name="Command_Compass_Tooltip">
 		コンパス
 	</string>
@@ -5063,4 +5072,13 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
new file mode 100644
index 0000000000..ae7dd3c441
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
new file mode 100644
index 0000000000..97a2e8327c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSA:">
+	<floater.string name="Title">
+		CONVERSA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index 0fbb826a96..a1cea72b1e 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAS"/>
+<multi_floater name="floater_im_box" title="CONVERSAS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
+					<button name="add_btn" tool_tip="Iniciar uma nova conversa"/>
+					<button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Recolher este painel"/>
+					<text name="stub_textbox">
+						Esta conversa está em uma janela separada.   [secondlife:/// Trazer de volta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 5543ffa41d..9f6a7a06ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Para" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/>
+	<floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/>
+	<floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/>
+	<floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexão por voz"/>
+				<button name="close_btn" tool_tip="Encerrar esta conversa"/>
+				<button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Para" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 6344258fa0..1e86f847ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz?
 	</floater.string>
 	<text name="question">
-		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
+		Se você atender, será desconectado de suas conversas de voz atuais.
 	</text>
-	<button label="Aceitar" label_selected="Aceitar" name="Accept"/>
-	<button label="Rejeitar" label_selected="Rejeitar" name="Reject"/>
-	<button label="Enviar MI" name="Start IM"/>
+	<button label="Atender" label_selected="Atender" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Iniciar MI em vez disso" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index 182f2513e0..d04cf2a173 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Exibir:
 			</text>
-			<check_box label="Mundo" name="show_world"/>
+			<check_box label="Testar" name="show_world"/>
 			<check_box label="Apenas móveis" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index a75cf34a94..ba4ef0afde 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box initial_value="true" label="Visualização em tempo real" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Visualização desativada"/>
 	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..de7aa2df12
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ">
+	<slider label="Bate-papo de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index b29ca3d699..71d3c33ae5 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ">
+<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
 	<string name="no_voice_effect">
 		(Não distorcer voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
new file mode 100644
index 0000000000..dae47a99ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE VOZ">
+	<slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
index 8716992a5e..b59895573e 100644
--- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Roupas novas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
new file mode 100644
index 0000000000..01316b887d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
+	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Remover amigos" name="remove_friends"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear voz" name="block_unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+	<menu_item_call label="Perfil do grupo" name="group_profile"/>
+	<menu_item_call label="Ativar grupo" name="activate_group"/>
+	<menu_item_call label="Sair do grupo" name="leave_group"/>
+	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
+		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
+		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..616e6db46e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Chamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/>
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Oferecer teletransporte" name="teleport"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..cab81175a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por data" name="sort_by_date"/>
+	<menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/>
+	<menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
new file mode 100644
index 0000000000..a8434dc336
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo" name="Add Friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..398b890f66
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Exibição compacta" name="compact_view"/>
+	<menu_item_check label="Exibição expandida" name="expanded_view"/>
+	<menu_item_check label="Mostrar hora" name="IMShowTime"/>
+	<menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index 7af760a6ee..df224a88fa 100644
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
 	<menu_item_call label="Bloquear..." name="Block"/>
+	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
+	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 894f1d741c..3602bdaac4 100644
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Novo cabelo" name="New Hair"/>
 		<menu_item_call label="Novos olhos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Expandir todas as pastas" name="expand"/>
+	<menu_item_call label="Recolher todas as pastas" name="collapse"/>
 	<menu_item_call label="Renomear look" name="rename"/>
 	<menu_item_call label="Excluir visual" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
new file mode 100644
index 0000000000..b61108cf54
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/>
+	<menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversas..." name="Conversation"/>
+	<menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/>
+	<menu_item_check label="Configurações de tradução..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..8bbde9b38c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Desbloquear" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..e69935995c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..b80d683c7b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
new file mode 100644
index 0000000000..46caeae310
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por status" name="sort_status"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
+	<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
index 9a924ad7b9..2ba7af17cd 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver dados" name="View Info"/>
 	<menu_item_call label="Bate-papo" name="Chat"/>
-	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Chamada de voz" name="Call"/>
 	<menu_item_call label="Ativar" name="Activate"/>
 	<menu_item_call label="Sair" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
new file mode 100644
index 0000000000..637e591ae1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 7c720f262b..51464fed68 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 79edb96b1c..7f3c6ace27 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friends"/>
+	<menu_item_call label="Remover amigo..." name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ligar" name="call"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..bce015e732
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
new file mode 100644
index 0000000000..e4b368fe14
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index ba5e055124..aa0a426405 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar perfil de residente" name="show_agent"/>
+	<menu_item_call label="Exibir perfil" name="show_agent"/>
+	<menu_item_call label="Enviar MI..." name="send_im"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index c197444181..247a92567a 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/>
+	<menu_item_call label="Perfil do objeto..." name="show_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index ca378c1b58..703df84efb 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
-		</menu>
+		<menu label="Status" name="Status"/>
 		<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="Painel da conta..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
-		<menu_item_check label="Bate-papo..." name="Nearby Chat"/>
+		<menu_item_check label="Conversas..." name="Conversations"/>
+		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
-		<menu_item_check label="Configurações de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Distorção de voz..." name="ShowVoice"/>
+		<menu label="Distorção de voz" name="VoiceMorphing">
+			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Visualizar..." name="Preview"/>
+			<menu_item_call label="Assinar..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
 		<menu_item_call label="Lista de bloqueados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Pegar" name="Menu Object Take"/>
 			<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
-			<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opções" name="Options">
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Como..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
+		<menu_item_call label="Guia do usuário" name="User’s guide"/>
+		<menu_item_call label="Base de conhecimento" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Fóruns da comunidade" name="Community Forums"/>
+		<menu_item_call label="Portal de suporte" name="Support portal"/>
+		<menu_item_call label="Notícias do [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
@@ -336,9 +344,14 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocidade de animação" name="Animation Speed">
+				<menu_item_call label="Todas as animações 10% mais rápidas" name="All Animations 10 Faster"/>
+				<menu_item_call label="Todas as animações 10% mais lentas" name="All Animations 10 Slower"/>
+				<menu_item_call label="Redefinir todas as velocidades de animação" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animações em câmera lenta" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Dados da animação" name="Animation Info"/>
-			<menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/>
 			<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="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index ff7382bf80..d9f5e48745 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -510,6 +510,24 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://www.nvidia.com.br/Download/index.aspx?lang=br
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -1533,10 +1551,13 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Modo ocupado ativado. 
-O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua resposta de modo ocupado.  Todas as ofertas de teletransporte serão recusadas.  Todas as ofertas de inventário serão colocadas na Lixeira.
-		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Não perturbe está ativado.  Você não será notificado de comunicações recebidas.
+
+- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências &gt; Geral).
+- As ofertas de teletransporte serão recusadas.
+- Chamadas de voz serão recusadas.
+		<usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
@@ -2022,6 +2043,10 @@ Mover para o inventário o(s) item(s)?
 		Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta?
 		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada.  Todos os participantes recebem notificações sobre a nova conversa.
+		<usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Tem certeza que deseja sair?
 		<usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/>
@@ -2096,14 +2121,14 @@ Você deseja substituí-lo pelo objeto selecionado?
 			<button ignore="Never Replace" name="No" text="Não"/>
 		</form>
 	</notification>
-	<notification label="Aviso de Modo Ocupado" name="BusyModePay">
-		Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento.
+	<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
+		Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
 
-Você gostaria de deixar o modo Ocupado antes de completar esta transação?
+Deseja desativar o Não perturbe antes de concluir esta transação?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="Sim"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Não"/>
+			<ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/>
+			<button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/>
+			<button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2238,11 +2263,8 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 	<notification name="GroupNotice">
 		Assunto: [SUBJECT], Mensagem: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
@@ -2467,13 +2489,6 @@ Logo, não é possível voar aqui.
 	<notification name="DynamicPathfindingDisabled">
 		O pathfinding dinâmico não está habilitado nesta região.  Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento.  Para fazer com que os objetos em movimento se comportem corretamente, clique no botão “Recarregar região”.  Escolha “Ajuda” para obter mais informações.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Ajuda" ignoretext="A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Erro.  Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção.  Às vezes, fazer login e logout novamente resolve este problema.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2736,7 +2751,7 @@ OK?
 	<notification name="ScriptQuestionCaution">
 		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
   
-Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
+Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
 			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
@@ -3310,4 +3325,633 @@ Tentativa cancelada.
 		Você está excluindo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
 		<usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] descongelou você.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		O congelamento falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Seu congelamento expirou, vá cuidar da sua vida.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Não é possível congelar esse usuário.
+	</notification>
+	<notification name="NowOwnObject">
+		Agora você é o proprietário do objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite.  Use a ferramenta de terrenos para ver a propriedade do terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		O objeto não pode ser renderizado porque há muitas solicitações.
+	</notification>
+	<notification name="SitFailCantMove">
+		Você não pode sentar porque não pode se mover no momento.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Você não pode sentar porque não está autorizado a sentar nesse terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Tente chegar mais perto.  Não é possível sentar no objeto porque
+ele não está na mesma região que você.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Não foi possível criar um novo objeto. A região está cheia.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Você não pode criar árvores e grama em terrenos que não são sua propriedade.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		A cópia falhou porque você não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; não pode ser transferido para você.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; contribui para o navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicar sem objetos raiz selecionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Não é possível duplicar objetos porque a região está cheia.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Não é possível criar objeto porque 
+o lote está cheio.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Falha na tentativa de renderizar um objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Não é possível criar um item que causou problemas a essa região.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Esse item do inventário foi incluído na lista.
+	</notification>
+	<notification name="NoCanRezObjects">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Pesquisa de terreno bloqueada.
+Você realizou muitas pesquisas de terreno muito rápido.
+Tente novamente em instantes.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Você morreu e foi teletransportado para seu início
+	</notification>
+	<notification name="EjectComingSoon">
+		Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Você não pode entrar nesta região porque 
+o servidor está cheio.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Salvar no inventário foi desativado.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque você não tem permissão para modificar o objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no inventário -- essa operação foi desativada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Você não pode copiar sua seleção porque não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		A remoção do objeto &apos;[OBJ_NAME]&apos; do simulador é proibida pelo sistema de permissões.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Você não pode salvar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Não é possível salvar sua seleção porque o objeto &apos;[OBJ_NAME]&apos; não é copiável.
+	</notification>
+	<notification name="NoModNoTaking">
+		Você não pode levar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Erro interno: tipo de destino desconhecido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		A exclusão falhou porque o objeto não foi encontrado
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Não é possível expulsar esse usuário.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posição de início definida.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		A expulsão falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Você não está autorizado a modificar este objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Não é possível ativar propriedades físicas para objetos keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Não é possível adicionar item!
+	</notification>
+	<notification name="UnableEditItem">
+		Não é possível editar isso!
+	</notification>
+	<notification name="NoPermToEdit">
+		Não é permitido editar isso.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Não é permitido copiar esse inventário.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Não é possível salvar no conteúdo do objeto: O item não existe mais.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Muitos scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Não é possível adicionar script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Servidor de objetos não respondeu a tempo.  Objeto retornado a sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta região não tem formas físicas ativadas.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Você não pode modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Não é possível definir as propriedades físicas neste tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Não é possível definir que um prim raiz não tenha forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta região não tem materiais físicos ativados.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Apenas prims raiz podem ter seus materiais físicos ajustados.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Ainda não há suporte para a configuração dos materiais físicos em personagens.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Uma ou mais das propriedades do material físico são inválidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Você não pode alterar o tipo de acabamento de um objeto mesh.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Você não pode alterar a forma de um objeto mesh
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Você não pode entrar nesta região porque \nela está cheia.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Falha na vinculação -- proprietários diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Falha na vinculação -- não é possível modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Ocorreu uma falha na vinculação porque você não tem permissão de edição.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Falha na vinculação -- muitos prims
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Falha na vinculação -- nada é vinculável.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Falha na vinculação -- muitos personagens com pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Falha na vinculação -- recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		O objeto usa muitos recursos físicos – sua dinâmica foi desativada.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Você foi teletransportado por um anexo em [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de um usuário desconhecido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Não foi possível criar o objeto solicitado. A região está cheia.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Não é possível anexar vários objetos a um local.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Você não pode criar vários objetos aqui.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Não foi possível criar o objeto solicitado. Tente novamente.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Falha na renderização, objeto solicitado demorou muito a carregar.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Você não pode criar plantas neste terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Não é possível renderizar o objeto porque os dados de mesh são inválidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Não foi possível renderizar objeto porque já há muitos scripts nesta região.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Seus privilégios de acesso não permitem que você crie objetos aqui.
+	</notification>
+	<notification name="CantCreateObject">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parâmetros de objeto inválidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Seus privilégios de acesso não permitem que você duplique objetos aqui.
+	</notification>
+	<notification name="CantChangeShape">
+		Você não está autorizado a alterar essa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Seus privilégios de acesso não permitem que você reivindique objetos aqui.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		A doação falhou porque você não está autorizado a doar objetos ao seu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Seus privilégios de acesso não permitem que você compre objetos aqui.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Não é possível anexar objeto porque um avatar está sentado nele.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Árvores e grama não podem ser usadas como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Não é possível anexar objetos de propriedade de um grupo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Não é possível anexar objetos que não sua propriedade.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Não é possível anexar objetos que contribuem com o navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Não é possível vincular objeto porque você não tem permissão para movê-lo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Falha ao largar anexo: você não está autorizado a largá-lo aqui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Falha ao largar anexo: recursos de terreno disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Falha ao largar anexos: recursos disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Não é possível largar objeto aqui.  O lote está cheio.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Detalhe seus parâmetros de exclusão.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Não é possível carregar objeto.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Não foi possível encontrar usuário para teletransportar para início
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		solicitação de poderes de deus falhou
+	</notification>
+	<notification name="GenericRequestFailed">
+		falha em solicitação genérica
+	</notification>
+	<notification name="CantUploadPostcard">
+		Não foi possível carregar cartão postal.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Não foi possível obter detalhes de inventário para o anúncio de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Não é possível enviar anúncio de grupo -- não permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Não é possível enviar anúncio de grupo -- não foi possível construir inventário.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Não é possível processar o inventário do anúncio.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Falha no envio de terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Arquivo de terreno gravado.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Arquivo de terreno criado, iniciando o download...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno confeccionado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Você precisa atualizar seu visualizador para comprar este lote.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Não é possível comprar, este lote não está à venda.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Não é possível comprar, o preço de venda ou a área do terreno foram alterados.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Você não é o comprador autorizado deste lote.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Você não pode comprar este lote porque já está aguardando aut. de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Não é possível criar objeto aqui porque isso sobrecarregaria o lote.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Não há lotes alugados suficientes na seleção para reunir.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -&gt; Relatar bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		O terreno foi dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Você comprou um passe.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		A região não permite classificados.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Seu passe para este terreno está prestes a expirar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Não há uma superfície adequada para sentar, tente outro local.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Não há espaço para sentar aqui, tente outro local.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		A reivindicação do objeto falhou porque você não tem permissão
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		A reivindicação do objeto falhou porque você não tem L$ suficiente.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Não é possível doar terrenos de propriedade de um grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		A compra do objeto falhou porque você não tem L$ suficientes.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		A compra do inventário falhou porque você não tem L$ suficiente
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Você não tem L $ suficientes para comprar um passe para este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Não é possível comprar passe no momento.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Não é possível criar objeto porque \no lote está cheio.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Não é possível criar marco para o evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Seus poderes de deus rompem o congelamento!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Falha na solicitação de poderes especiais. Essa solicitação foi registrada.
+	</notification>
+	<notification name="ExpireExplanation">
+		O sistema não pode processar sua solicitação no momento. A solicitação expirou.
+	</notification>
+	<notification name="DieExplanation">
+		O sistema não pode processar sua solicitação.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fundos insuficientes para criar prim.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fundos insuficientes para criar objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Redefinir Início pois o Início não era legal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posição de início definida.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Não é possível desrenderizar objeto devido a uma falha de inventário.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Não é possível criar o inventário solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Não é possível criar a pasta de inventário solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		Não é possível criar esse inventário.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Não é possível criar marco.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Não é possível criar roupa agora. Tente novamente em instantes.
+	</notification>
+	<notification name="InventoryNotForSale">
+		O inventário não está à venda.
+	</notification>
+	<notification name="CantFindInvItem">
+		Não é possível encontrar item do inventário.
+	</notification>
+	<notification name="CantFindObject">
+		Não foi possível encontrar objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Transferências de dinheiro para objetos estão desativadas para esta região no momento.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Não foi possível descobrir a quem pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Não é possível dar L$ a objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Falha na criação de inventário de objetos do mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Um erro interno impediu que seu visualizador fosse atualizado corretamente.  O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Não é possível criar grandes prims que interceptam outros jogadores.  Tente novamente quando os outros jogadores tiverem se movido.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo.
+		<usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos.
+		<usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Não foi possível mover arquivos. Caminho anterior restaurado.
+		<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index b444593af8..22eb23ebc5 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
index c5f93d719a..2fcf6b9932 100644
--- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de bloqueados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
-	<button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/>
-	<button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/>
-	<button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrar" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/>
+		<menu_button name="view_btn" tool_tip="Opções de ordenação"/>
+		<menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/>
+		<button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..f56168c962
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(carregando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..74daded58f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/>
+	<icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/>
+	<button name="delete_btn" tool_tip="Remover esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index 19c34d2f10..0490878507 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index f3af15b991..babb48c208 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -14,81 +14,53 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_filtered_friends_msg">
 		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
-	<string name="people_filter_label" value="Filtro de pessoas"/>
-	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
-		<panel label="MEUS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEUS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opções"/>
-				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
-				<button name="activate_btn" tool_tip="Ativar o grupo selecionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
+				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADA" name="blocked_panel">
+			<panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 350d53b81c..baf14c2c23 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<text name="font_size">
-		Tamanho da fonte:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Pequeno" name="radio" value="0"/>
-		<radio_item label="Médio" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
-	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
-	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar MIs em:
-	</text>
-	<text name="requires_restart_label">
-		(Reinicie para ativar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
-		<radio_item label="Janelas separadas" name="radio" value="0"/>
-		<radio_item label="Guias" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Ativar pop-ups de novos bate-papos:
-	</text>
-	<check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/>
-	<check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+		<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamanho da fonte:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeno" name="Small" value="0"/>
+			<item label="Médio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notificações
+		</text>
+		<text name="friend_ims">
+			MIs de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			MIs de não amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			MIs de conferências:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Bate-papo de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Bate-papo local:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Executar som:
+		</text>
+		<check_box label="Nova conversa" name="new_conversation"/>
+		<check_box label="Chamada de voz recebida" name="incoming_voice_call"/>
+		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventário" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Limpar registro..." name="clear_log"/>
+		<button label="Excluir transcrições..." name="delete_transcripts"/>
+		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
+	</panel>
 	<button label="Tradução..." name="ok_btn"/>
 	<button label="Substituição automática..." name="autoreplace_showgui"/>
 	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index c53aa7d5f7..8a0495f9bb 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="(nunca)" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Mensagem do modo ocupado:
+		Resposta de Não perturbe:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 3cfe0fe4f4..f0fd438cef 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Comprar objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index bc72b86020..4bf18aab70 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=pt-BR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -571,8 +571,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AvatarAway">
 		Distante
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		Não perturbe
 	</string>
 	<string name="AvatarMuted">
 		Mudo
@@ -808,6 +808,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ST_NO_JOINT">
 		Não é possível encontrar a raiz (ROOT) ou junção (JOINT).
 	</string>
+	<string name="NearbyChatTitle">
+		Bate-papo local
+	</string>
+	<string name="NearbyChatLabel">
+		(Bate-papo local)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -871,6 +877,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
+	<string name="AgentNameSubst">
+		(Você)
+	</string>
 	<string name="TeleportYourAgent">
 		Teletransportá-lo
 	</string>
@@ -955,18 +964,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="dictionary_files">
 		Dicionários
 	</string>
-	<string name="AvatarSetNotAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		deixar como não ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Deixar como ocupado
-	</string>
 	<string name="shape">
 		Silhueta
 	</string>
@@ -1923,8 +1920,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="PanelContentsNewScript">
 		Novo Script
 	</string>
-	<string name="BusyModeResponseDefault">
-		O residente para o qual escreveu está no modo &apos;ocupado&apos;, ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente ativou o &quot;Não perturbe&quot; e verá sua mensagem mais tarde.
 	</string>
 	<string name="MuteByName">
 		(por nome)
@@ -2037,9 +2034,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Conteúdo
-	</string>
 	<string name="AcquiredItems">
 		Itens adquiridos
 	</string>
@@ -3753,7 +3747,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Região em geral
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visíveis e bate-papo permitido fora deste terreno
+		Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada.
@@ -3830,6 +3824,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Para visualizar esta mensagem, você deve desmarcar &quot;Apenas amigos e grupos podem me ligar ou enviar MIs&quot; em Preferências/Privacidade.
 	</string>
+	<string name="OnlineStatus">
+		Conectado
+	</string>
+	<string name="OfflineStatus">
+		Desconectado
+	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
@@ -3839,6 +3839,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Você entrou na ligação
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Você recusou automaticamente a chamada de voz enquanto &quot;Não perturbe&quot; estava ativado.
+	</string>
 	<string name="name_started_call">
 		[NAME] iniciou uma ligação de voz
 	</string>
@@ -3851,6 +3854,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Saiu da ligação de voz
 	</string>
+	<string name="conference-title">
+		Bate-papo com várias pessoas
+	</string>
 	<string name="conference-title-incoming">
 		Conversa com [AGENT_NAME]
 	</string>
@@ -4726,6 +4732,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Label">
 		Bate-papo
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversas
+	</string>
 	<string name="Command_Compass_Label">
 		Bússola
 	</string>
@@ -4801,6 +4810,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Tooltip">
 		Bater papo com pessoas próximas usando texto
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar com todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bússola
 	</string>
@@ -4930,4 +4942,13 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="UserDictionary">
 		[Usuário]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
new file mode 100644
index 0000000000..090ac7193a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА">
+	<panel name="buttons_panel">
+		<filter_editor label="Фильтр для людей" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
new file mode 100644
index 0000000000..23225fcf56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="РАЗГОВОР:">
+	<floater.string name="Title">
+		РАЗГОВОР: [NAME]
+	</floater.string>
+	<text name="page_label" value="Страница"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
index b147cfa2b3..eba7a19cd4 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/>
+<multi_floater name="floater_im_box" title="ОБЩЕНИЕ">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/>
+					<button name="add_btn" tool_tip="Начать разговор"/>
+					<button name="speak_btn" tool_tip="Разговаривать через микрофон"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/>
+					<text name="stub_textbox">
+						Разговор отображается в отдельном окне.   [secondlife:/// Вернуть.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index 604d9dc6d3..ea110ffb44 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Кому" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/>
+	<floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/>
+	<floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/>
+	<floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/>
+	<floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/>
+	<floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<button name="add_btn" tool_tip="Добавить участника в этот разговор"/>
+				<button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/>
+				<button name="close_btn" tool_tip="Завершить этот разговор"/>
+				<button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Переводить чат" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Кому" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
index 072c20147d..3f61421d0c 100644
--- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		анонимно
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		вызывает.
+		вызывает вас.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		теперь участвует в групповом голосовом чате.
@@ -25,9 +25,9 @@
 		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</floater.string>
 	<text name="question">
-		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
+		Если вы ответите, вы покинете текущий голосовой чат.
 	</text>
-	<button label="Принять" label_selected="Принять" name="Accept"/>
-	<button label="Отклонить" label_selected="Отклонить" name="Reject"/>
-	<button label="Начать IM" name="Start IM"/>
+	<button label="Ответить" label_selected="Ответить" name="Accept"/>
+	<button label="Игнорировать" label_selected="Игнорировать" name="Reject"/>
+	<button label="Открыть IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index fa72df04fd..8faddb1805 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Показать:
 			</text>
-			<check_box label="Мир" name="show_world"/>
+			<check_box label="Тест" name="show_world"/>
 			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
 			<check_box label="Навигационная сетка" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index db37089aeb..a9a21e7d4a 100644
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
-	<check_box initial_value="истина" label="Просмотр вживую" name="apply_immediate_check"/>
+	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5a7e7a7061
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА">
+	<slider label="Голосовой чат" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
index 1eb8a94d7a..d3cef042a3 100644
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА">
+<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
 	<string name="no_voice_effect">
 		(Нет изменения голоса)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
new file mode 100644
index 0000000000..aca6bd518a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА">
+	<slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
index 0332c03a04..b7a32dfd75 100644
--- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Новая одежда" name="COF.Gear.New_Clothes"/>
-	<menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
new file mode 100644
index 0000000000..530b1ea704
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
+	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
+	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Удалить друзей" name="remove_friends"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Блокировать голос" name="block_unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+	<menu_item_call label="Профиль группы" name="group_profile"/>
+	<menu_item_call label="Активировать группу" name="activate_group"/>
+	<menu_item_call label="Покинуть группу" name="leave_group"/>
+	<context_menu label="Параметры модератора" name="Moderator Options">
+		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
+		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/>
+		<menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..3fbffbe038
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Голосовой вызов..." name="Call"/>
+	<menu_item_call label="Открыть журнал чата..." name="Chat history"/>
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="Invite"/>
+	<menu_item_call label="Карта" name="Map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Черный список" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..928146e273
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по дате" name="sort_by_date"/>
+	<menu_item_check label="Сначала друзья" name="sort_by_friends"/>
+	<menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
new file mode 100644
index 0000000000..1db0b8bae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Добавить друга" name="Add Friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Блокировать голос" name="Block/Unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..35cff8e4bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Компактный вид" name="compact_view"/>
+	<menu_item_check label="Развернутый вид" name="expanded_view"/>
+	<menu_item_check label="Показать время" name="IMShowTime"/>
+	<menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 6229b2e72f..0c50abcfbd 100644
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Профиль объекта..." name="Object Profile"/>
 	<menu_item_call label="Блокировать..." name="Block"/>
+	<menu_item_call label="Показать на карте" name="show_on_map"/>
+	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index 93dbd7d6a7..d379a17216 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Новые волосы" name="New Hair"/>
 		<menu_item_call label="Новые глаза" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Открыть все папки" name="expand"/>
+	<menu_item_call label="Закрыть все папки" name="collapse"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
 	<menu_item_call label="Удалить костюм" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
new file mode 100644
index 0000000000..851a42d428
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/>
+	<menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/>
+	<menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/>
+	<menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/>
+	<menu_item_call label="Изменить настройки..." name="chat_preferences"/>
+	<menu_item_call label="Настройки приватности..." name="privacy_preferences"/>
+	<menu_item_check label="Журнал разговора..." name="Conversation"/>
+	<menu_item_check label="Перевести локальный чат" name="Translate_chat"/>
+	<menu_item_check label="Настройки перевода..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..157f2ad5e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Разблокировать" name="unblock"/>
+	<menu_item_call label="Профиль…" name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..f42e8f8609
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/>
+	<menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..8c0150e8ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по типу" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
new file mode 100644
index 0000000000..7b2dba0539
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
+	<menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
index e734a83ef0..78d73c9d1e 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Информация" name="View Info"/>
 	<menu_item_call label="Чат" name="Chat"/>
-	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Голосовой вызов" name="Call"/>
 	<menu_item_call label="Активация" name="Activate"/>
 	<menu_item_call label="Покинуть" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
new file mode 100644
index 0000000000..cbf1c64774
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index ebce959044..d05b7e7d01 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="В друзья" name="Add Friend"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Карта" name="Map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Черный список" name="Block/Unblock"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Посмотреть журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Черный список" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
index 0e8e0d4053..88eb56c9f5 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Добавить в друзья" name="Add Friends"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить в друзья" name="add_friends"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Звонок" name="call"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..2bc353ad58
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Смотреть карту" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a009cf081f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по времени" name="sort_most"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 0ba3ee152a..230d049fad 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать профиль жителя" name="show_agent"/>
+	<menu_item_call label="Смотреть профиль" name="show_agent"/>
+	<menu_item_call label="Отправить сообщение..." name="send_im"/>
+	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 6e7800d3f5..1326db708e 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать информацию об объекте" name="show_object"/>
+	<menu_item_call label="Профиль объекта..." name="show_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d9425937c3..d6625361c5 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Статус" name="Status">
-			<menu_item_call label="Нет на месте" name="Set Away"/>
-			<menu_item_call label="Не беспокоить" name="Set Busy"/>
-		</menu>
+		<menu label="Статус" name="Status"/>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
 		<menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
-		<menu_item_check label="Чат..." name="Nearby Chat"/>
+		<menu_item_check label="Разговоры..." name="Conversations"/>
+		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
-		<menu_item_check label="Настройки голоса..." name="Nearby Voice"/>
-		<menu_item_check label="Изменение голоса..." name="ShowVoice"/>
+		<menu label="Изменение голоса" name="VoiceMorphing">
+			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
+			<menu_item_check label="Просмотр..." name="Preview"/>
+			<menu_item_call label="Подписаться..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Жесты..." name="Gestures"/>
-		<menu_item_call label="Друзья" name="My Friends"/>
-		<menu_item_call label="Группы" name="My Groups"/>
-		<menu_item_call label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_check label="Друзья" name="My Friends"/>
+		<menu_item_check label="Группы" name="My Groups"/>
+		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
 		<menu_item_call label="Черный список" name="Block List"/>
 	</menu>
 	<menu label="Мир" name="World">
@@ -113,7 +114,6 @@
 			<menu_item_call label="Купить" name="Menu Object Buy"/>
 			<menu_item_call label="Взять" name="Menu Object Take"/>
 			<menu_item_call label="Взять копию" name="Take Copy"/>
-			<menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
 		</menu>
@@ -128,6 +128,7 @@
 			<menu_item_call label="Наборы связей..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Персонажи..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Просмотр/тестирование..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Восстановить регион" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Параметры" name="Options">
 			<menu_item_check label="Показать расширенные разрешения" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
 	<menu label="Справка" name="Help">
 		<menu_item_call label="Инструкции..." name="How To"/>
 		<menu_item_call label="Справка по [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Руководство пользователя" name="User’s guide"/>
+		<menu_item_call label="База знаний" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Форумы сообщества" name="Community Forums"/>
+		<menu_item_call label="Портал поддержки" name="Support portal"/>
+		<menu_item_call label="Новости [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Жалоба" name="Report Abuse"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
@@ -383,9 +391,14 @@
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Скорость анимации" name="Animation Speed">
+				<menu_item_call label="Ускорить все анимации на 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Замедлить все анимации на 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Восстановить скорость анимаций" name="Reset All Animation Speed"/>
+				<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
-			<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
 			<menu_item_check label="Показать указание" name="Show Point At"/>
 			<menu_item_check label="Отладка обновленных движений суставов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 85b7074253..00ab0b5763 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -516,6 +516,24 @@
 		</url>
 		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=ru-ru
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -1546,10 +1564,13 @@ http://secondlife.com/download.
 		Сейчас невозможно предложить дружбу. Повторите попытку через минуту.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Установлен режим «Занят».
-Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину.
-		<usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Режим «Не беспокоить» включен.  Вы не будете получать уведомлений о входящих вызовах.
+
+- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки &gt; Общие).
+- Предложения телепортации будут отклоняться.
+- Голосовые вызовы будут отклоняться.
+		<usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение.
@@ -2033,6 +2054,10 @@ http://secondlife.com/download.
 		Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта?
 		<usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		При добавлении участника в существующий разговор будет создан новый разговор.  Все участники получат уведомления о новом разговоре.
+		<usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Выйти из программы?
 		<usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/>
@@ -2107,14 +2132,14 @@ http://secondlife.com/download.
 			<button ignore="Не заменять" name="No" text="Отмена"/>
 		</form>
 	</notification>
-	<notification label="Предупреждение о режиме «Занят»" name="BusyModePay">
-		У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж.
+	<notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay">
+		Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж.
 
-Хотите отключить режим «Занят» до завершения этой транзакции?
+Отключить режим «Не беспокоить» перед завершением этой операции?
 		<form name="form">
-			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/>
-			<button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/>
-			<button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/>
+			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/>
+			<button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/>
+			<button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ http://secondlife.com/download.
 	<notification name="GroupNotice">
 		Раздел: [SUBJECT], сообщение: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; в сети
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; не в сети
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Вы лучше всех, но нельзя добавить в друзья себя самого.
@@ -2482,13 +2504,6 @@ http://secondlife.com/download.
 	<notification name="DynamicPathfindingDisabled">
 		В этом регионе не разрешен динамический поиск пути.  Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов.  Чтобы исправить их поведение, нажмите кнопку «Восстановить регион».  Более подробная информация – по ссылке «Справка».
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Справка" ignoretext="Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Произошла ошибка.  Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство.  Иногда для устранения этой проблемы достаточно выйти и снова войти.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2766,7 @@ http://secondlife.com/download.
 	<notification name="ScriptQuestionCaution">
 		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
   
-Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
+Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
 			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
@@ -3333,4 +3348,632 @@ http://secondlife.com/download.
 		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
 		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Аватар заморожен.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] разморозил вас.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Аватар разморожен.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Не удалось заморозить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Заморозка кончилась, занимайтесь своим делом.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Невозможно заморозить этого пользователя.
+	</notification>
+	<notification name="NowOwnObject">
+		Вы стали владельцем объекта [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли.  Узнать, кто владелец, можно с помощью инструмента «Земля».
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Невозможно выложить объект: слишком много запросов.
+	</notification>
+	<notification name="SitFailCantMove">
+		Нельзя сесть: сейчас вы не можете двигаться.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Вам не разрешено садиться на этой земле.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Попробуйте переместиться ближе.  Нельзя сесть на объект:
+он находится в другом регионе.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Невозможно создать новый объект. Регион уже заполнен.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Вы не можете создавать деревья и траву на чужой земле.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Выбран дубликат без корневых объектов.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Невозможно дублировать объекты: регион заполнен.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Невозможно дублировать объекты: не удалось найти их участок.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Нельзя создать объект: 
+участок уже заполнен.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Не удалось выложить объект.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Невозможно создать элемент, который вызвал проблемы в этом регионе.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Этот предмет инвентаря находится в черном списке.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Поиск по земле заблокирован.
+Вы провели слишком много операций поиска за короткое время.
+Повторите попытку через минуту.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Вы умерли и были телепортированы в ваше домашнее местоположение
+	</notification>
+	<notification name="EjectComingSoon">
+		Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Вам нет доступа в этот регион: 
+серпер переполнен.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Сохранение в инвентаре отключено.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]».
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется.
+	</notification>
+	<notification name="NoModNoTaking">
+		Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="RezDestInternalError">
+		Внутренняя ошибка: неизвестный тип места назначения.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Невозможно удалить: объект не найден
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Невозможно выбросить этого пользователя.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="HomePositionSet">
+		Задано положение дома.
+	</notification>
+	<notification name="AvatarEjected">
+		Аватар выброшен.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Не удалось выбросить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		У вас нет прав на изменение этого объекта
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Нельзя включить физику для объекта, который относится к навигационной сетке.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Нельзя включить физику для объектов с ключевыми кадрами.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Нельзя включить физику для объекта -- недостаточно земельных ресурсов.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке.
+	</notification>
+	<notification name="UnableAddItem">
+		Невозможно добавить предмет!
+	</notification>
+	<notification name="UnableEditItem">
+		Редактирование невозможно!
+	</notification>
+	<notification name="NoPermToEdit">
+		Редактирование не разрешено.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Не разрешено копировать этот инвентарь.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Нельзя сохранить в содержимом объекта: предмет уже не существует.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта.
+	</notification>
+	<notification name="TooManyScripts">
+		Слишком много скриптов.
+	</notification>
+	<notification name="UnableAddScript">
+		Невозможно добавить скрипт!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Сервер активов не ответил в заданное время.  Объект возвращен в симулятор.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		В этом регионе не разрешены фигуры с физическими данными.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Нельзя задать свойства физики для объекта этого типа.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Нельзя задать корневой примитив без фигуры.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		В этом регионе не разрешены материалы с физическими данными.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Настройка материалов с физическими данными разрешена только для корневых примитивов.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Присвоение персонажам материалов с физическими данными еще не поддерживается.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Одно или несколько свойств указанного материала с физическими данными недопустимы.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Не разрешается изменять тип стыковки меш-объекта.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Не разрешается изменять форму меш-объекта
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Вам нет доступа в этот регион: \nрегион заполнен.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Связь невозможна -- разные владельцы
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Связь невозможна – нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Связь невозможна: у вас нет разрешения на редактирование.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Связь невозможна -- слишком много примитивов
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Связь невозможна -- нельзя связать некопируемый и непереносимый объекты
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Связь невозможна -- нет связываемых объектов.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Связь невозможна -- слишком много персонажей с поиском пути
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Связь невозможна -- недостаточно земельных ресурсов
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Объект использует слишком много ресурсов физики -- динамическое поведение отключено.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]»
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Вы были телепортированы прикрепленным объектом [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Невозможно создать запрошенный объект. Регион уже заполнен.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Нельзя присоединить несколько объектов к одной точке.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Здесь нельзя создать несколько объектов.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Невозможно создать запрошенный объект. Объекта нет в базе данных.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Невозможно создать запрошенный объект. Повторите попытку.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Не удалось выложить, загрузка нужного объекта длится слишком долго.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Вам нельзя создавать растения на этой земле.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Невозможно восстановить объект. Не найдена позиция в игровом мире.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Невозможно выложить объект: его данные сетки неверны.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Невозможно выложить объект: в этом регионе уже сликом много скриптов.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ваши привилегии доступа не разрешают создание объектов на этом месте.
+	</notification>
+	<notification name="CantCreateObject">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Неверные параметры объекта
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ваши привилегии доступа не разрешают дублирование объектов на этом месте.
+	</notification>
+	<notification name="CantChangeShape">
+		Вам не разрешено изменять эту фигуру.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ваши привилегии доступа не разрешают претендовать на объекты на этом месте.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Не удалось передать: вам не разрешено передавать объекты для этой группы.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ваши привилегии доступа не разрешают покупать объекты на этом месте.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Невозможно присоединить объект: на нем сидит аватар.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Деревья и траву нельзя носить как прикрепленные объекты.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Нельзя присоединять объекты, принадлежащие группе.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Нельзя прикреплять объекты, которыми вы не владеете.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Невозможно присоединить объекты, которые относятся к навигационной сетке.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Нельзя присоединить объект: вам не разрешено его перемещать.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Нельзя сбросить объект здесь.  Участок уже заполнен.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Нельзя коснуться/взять этот объект: вы забанены на этом участке.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Уточните параметры удаления.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Невозможно отправить актив.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Не удалось найти пользователя для телепортации домой
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		режим творца недоступен
+	</notification>
+	<notification name="GenericRequestFailed">
+		не удалось выполнить общий запрос
+	</notification>
+	<notification name="CantUploadPostcard">
+		Невозможно отправить открытку.  Повторите попытку позже.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Невозможно получить данные инвентаря для группового уведомления.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Невозможно отправить групповое уведомление -- не разрешено.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Невозможно отправить групповое уведомление -- не удалось собрать инвентарь.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Невозможно проанализировать инвентарь, указанный в уведомлении.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Не удалось загрузить ландшафт.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Файл ландшафта записан.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Файл ландшафта записан, начинается загрузка...
+	</notification>
+	<notification name="TerrainBaked">
+		Ландшафт готов.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Для покупки этого участка необходимо обновить клиент.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Невозможно купить, этот участок не предназначен для продажи.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Невозможно купить: цена или площадь земли изменились.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Вам не разрешено покупать этот участок.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Здесь нельзя создавать объекты – участок будет переполнен.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Выбрано недостаточно арендуемых участков для вступления.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -&gt; Сообщить об ошибке...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Земля разделена.
+	</notification>
+	<notification name="PassPurchased">
+		Вы приобрели пропуск.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		В регионе не разрешены рекламные объявления.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ваш пропуск на эту землю скоро закончится.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Здесь нет места, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Невозможно претендовать на объект: у вас нет разрешения
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Невозможно претендовать на объект: у вас не хватает L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Нельзя передать землю, принадлежащую группе.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Не удалось купить объект: у вас не хватает L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Не удалось купить инвентарь: у вас не хватает L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		У вас недостаточно L$, чтобы заплатить за проход на эту землю.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Сейчас нельзя купить пропуск.  Повторите попытку позже.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Невозможно создать объект:\nучасток заполнен.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Невозможно создать закладку для события.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Сила творца одолевает заморозку!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Не удалось выполнить запрос на особые способности. Запрос зарегистрирован.
+	</notification>
+	<notification name="ExpireExplanation">
+		Система сейчас не может обработать ваш запрос. Истекло время запроса.
+	</notification>
+	<notification name="DieExplanation">
+		Система не может обработать ваш запрос.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Недостаточно денег для создания примитива.
+	</notification>
+	<notification name="RezObjectFailure">
+		Недостаточно денег для создания объекта.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Недопустимое домашнее местоположение; восстановлено стандартное местоположение.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="SetHomePosition">
+		Домашнее местоположение задано.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Невозможно забрать объект: сбой инвентаря.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Невозможно создать требуемый инвентарь.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Невозможно создать требуемую папку инвентаря.
+	</notification>
+	<notification name="CantCreateInventory">
+		Невозможно создать этот инвентарь.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Невозможно создать закладку.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Сейчас нельзя создать костюм. Попробуйте через минуту.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Инвентарь не для продажи.
+	</notification>
+	<notification name="CantFindInvItem">
+		Не удалось найти предмет из инвентаря.
+	</notification>
+	<notification name="CantFindObject">
+		Не удалось найти объект.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Сейчас в этом регионе запрещен перевод денег на объекты.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Непонятно, кому платить.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Нельзя отдавать L$ за общедоступные объекты.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Не удалось создать инвентарь в объекте игрового мира.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Не удалось обновить клиент из-за внутренней ошибки.  Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Нельзя создавать большие примитивы, которые пересекаются с другими игроками.  Повторите попытку, когда другие игроки уйдут.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов.
+		<usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены.
+		<usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Невозможно переместить файлы. Восстановлен прежний путь.
+		<usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
index 75e396222f..4866bb7ed6 100644
--- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/>
 	<icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/>
 	<icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
index 214ca8bf3a..70a1b25996 100644
--- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Черный список
-	</text>
-	<scroll_list name="blocked" tool_tip="Список заблокированных жителей"/>
-	<button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/>
-	<button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/>
-	<button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Фильтр" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/>
+		<menu_button name="view_btn" tool_tip="Параметры сортировки"/>
+		<menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/>
+		<button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Список заблокированных жителей"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..4fdb4f9122
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(загрузка)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..98fe7b99be
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Включая голосовой чат"/>
+	<icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/>
+	<button name="delete_btn" tool_tip="Удалить эту запись"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index 7f000fb5a0..b043ffbbe2 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 607921f2d6..7da7fb3191 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском].
 	</string>
-	<string name="people_filter_label" value="Фильтр для людей"/>
-	<string name="groups_filter_label" value="Фильтр для групп"/>
 	<string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/>
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
-	<filter_editor label="Фильтр" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
-		<panel label="МОИ ДРУЗЬЯ" name="friends_panel">
+		<panel label="ДРУЗЬЯ" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Предложить жителю дружбу"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="МОИ ГРУППЫ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Опции"/>
-				<button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
-				<button name="activate_btn" tool_tip="Активировать выбранную группу"/>
+		<panel label="ГРУППЫ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Фильтр для групп" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/>
+				<menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
+				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
 			</panel>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
+		<panel label="БЛОКИРОВАН" name="blocked_panel">
+			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 9283fc9e6e..6383fc8c2c 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<text name="font_size">
-		Размер шрифта:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Мелкий" name="radio" value="0"/>
-		<radio_item label="Средний" name="radio2" value="1"/>
-		<radio_item label="Крупный" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
-	<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
-	<check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/>
-	<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Показывать сообщения:
-	</text>
-	<text name="requires_restart_label">
-		(требуется перезапуск)
-	</text>
-	<radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)">
-		<radio_item label="В отдельных окнах" name="radio" value="0"/>
-		<radio_item label="На вкладках" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Включить всплывающие сообщения с новыми репликами в чате:
-	</text>
-	<check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/>
-	<check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/>
-	<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
-	<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
+		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Размер шрифта:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Мелкий" name="Small" value="0"/>
+			<item label="Средний" name="Medium" value="1"/>
+			<item label="Крупный" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Уведомления
+		</text>
+		<text name="friend_ims">
+			IM друзей:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM чужих:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM конференции:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="group_chat">
+			Групповой чат:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Локальный чат:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Звук:
+		</text>
+		<check_box label="Новый разговор" name="new_conversation"/>
+		<check_box label="Входящий голосовой вызов" name="incoming_voice_call"/>
+		<check_box label="Предложение телепортации" name="teleport_offer"/>
+		<check_box label="Предложение инвентаря" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Очистить журнал..." name="clear_log"/>
+		<button label="Удалить записи..." name="delete_transcripts"/>
+		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
+	</panel>
 	<button label="Перевод..." name="ok_btn"/>
 	<button label="Автозамена..." name="autoreplace_showgui"/>
 	<button label="Проверка правописания..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index d1bfedf2d8..c7a850f78a 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Ответ в режиме «Занят»:
+		Ответ в режиме «Не беспокоить»:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index e9dd3760b5..5502530ca4 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Купить объект" name="Buyobject"/>
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
+			<combo_box.item label="Приблизить" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index f9ded799bf..d7d4df4a37 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ru-RU&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
@@ -619,7 +619,7 @@ support@secondlife.com.
 	<string name="AvatarAway">
 		Нет на месте
 	</string>
-	<string name="AvatarBusy">
+	<string name="AvatarDoNotDisturb">
 		Не беспокоить
 	</string>
 	<string name="AvatarMuted">
@@ -856,6 +856,12 @@ support@secondlife.com.
 	<string name="ST_NO_JOINT">
 		Не удается найти объект ROOT или JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Локальный чат
+	</string>
+	<string name="NearbyChatLabel">
+		(Локальный чат)
+	</string>
 	<string name="whisper">
 		шепчет:
 	</string>
@@ -919,12 +925,15 @@ support@secondlife.com.
 	<string name="ControlYourCamera">
 		Управлять камерой
 	</string>
-	<string name="TeleportYourAgent">
-		Телепортировать вас
-	</string>
 	<string name="NotConnected">
 		Нет подключения
 	</string>
+	<string name="AgentNameSubst">
+		(Вы)
+	</string>
+	<string name="TeleportYourAgent">
+		Телепортировать вас
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -1006,18 +1015,6 @@ support@secondlife.com.
 	<string name="dictionary_files">
 		Словари
 	</string>
-	<string name="AvatarSetNotAway">
-		На месте
-	</string>
-	<string name="AvatarSetAway">
-		Нет на месте
-	</string>
-	<string name="AvatarSetNotBusy">
-		Не занят(а)
-	</string>
-	<string name="AvatarSetBusy">
-		Не беспокоить
-	</string>
 	<string name="shape">
 		Фигура
 	</string>
@@ -1986,8 +1983,8 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		Новый скрипт
 	</string>
-	<string name="BusyModeResponseDefault">
-		У адресата вашего сообщения задан статус «Не беспокоить».  Ваше сообщение все равно будет отображено на панели IM для просмотра позже.
+	<string name="DoNotDisturbModeResponseDefault">
+		Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже.
 	</string>
 	<string name="MuteByName">
 		(по имени)
@@ -2100,9 +2097,6 @@ support@secondlife.com.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Контент
-	</string>
 	<string name="AcquiredItems">
 		Купленные вещи
 	</string>
@@ -3871,7 +3865,7 @@ support@secondlife.com.
 		Область общей дозволенности
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Все жители с других участков могут видеть аватары и общаться в чате
+		Аватары на этом участке невидимы и неслышимы для аватаров с других участков
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
@@ -3948,6 +3942,12 @@ support@secondlife.com.
 	<string name="IM_unblock_only_groups_friends">
 		Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность».
 	</string>
+	<string name="OnlineStatus">
+		Онлайн
+	</string>
+	<string name="OfflineStatus">
+		Оффлайн
+	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
 	</string>
@@ -3957,6 +3957,9 @@ support@secondlife.com.
 	<string name="you_joined_call">
 		Вы присоединились к голосовой беседе
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить».
+	</string>
 	<string name="name_started_call">
 		Житель [NAME] начал голосовую беседу
 	</string>
@@ -3973,7 +3976,7 @@ support@secondlife.com.
 		Соединяется...
 	</string>
 	<string name="conference-title">
-		Спонтанная конференция
+		Чат с несколькими участниками
 	</string>
 	<string name="conference-title-incoming">
 		Конференция с жителем [AGENT_NAME]
@@ -4865,6 +4868,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Label">
 		Чат
 	</string>
+	<string name="Command_Conversations_Label">
+		Разговоры
+	</string>
 	<string name="Command_Compass_Label">
 		Компас
 	</string>
@@ -4940,6 +4946,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Tooltip">
 		Обменивайтесь текстовыми репликами с людьми вокруг вас
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Поговорить со всеми
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Компас
 	</string>
@@ -5069,4 +5078,13 @@ support@secondlife.com.
 	<string name="UserDictionary">
 		[Пользователь]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
new file mode 100644
index 0000000000..5f8dac506f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ">
+	<panel name="buttons_panel">
+		<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..84403dfd68
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="KONUŞMA:">
+	<floater.string name="Title">
+		KONUŞMA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Sayfa"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
index 4451d1d309..6504430b3c 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="SOHBETLER"/>
+<multi_floater name="floater_im_box" title="SOHBETLER">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+					<button name="add_btn" tool_tip="Yeni bir sohbet başlat"/>
+					<button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/>
+					<text name="stub_textbox">
+						Sohbet ayrı bir pencerede.   [secondlife:/// Bunu geri getir.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index bed08b36c6..8ce8f0fe13 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Kime" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/>
+	<floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/>
+	<floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/>
+	<floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<button name="add_btn" tool_tip="Bu sohbete birini ekle"/>
+				<button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/>
+				<button name="close_btn" tool_tip="Bu sohbeti bitir"/>
+				<button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Kime" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
index adb03c2dff..0f2b27241e 100644
--- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonim
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		arıyor.
+		sizi arıyor.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		bir Sesli Sohbet aramasına bir konferans araması ile katıldı.
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
+		Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek.
 	</text>
-	<button label="Kabul Et" label_selected="Kabul Et" name="Accept"/>
-	<button label="Reddet" label_selected="Reddet" name="Reject"/>
-	<button label="Aİ Başlat" name="Start IM"/>
+	<button label="Yanıtla" label_selected="Yanıtla" name="Accept"/>
+	<button label="Yok say" label_selected="Yok say" name="Reject"/>
+	<button label="Bunun yerine Aİ aç" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 6eecc7fb77..35f47e6dfa 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Göster:
 			</text>
-			<check_box label="Dünya" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
 			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 889425f23a..42483c09e1 100644
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
 	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
-	<check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Önizleme Devre Dışı"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..ec350bee60
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ">
+	<slider label="Sesli Sohbet" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
index 3534a3fe90..7a157244cd 100644
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME">
+<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
 	<string name="no_voice_effect">
 		(Ses Şekillendirme Yok)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
new file mode 100644
index 0000000000..acf99d6199
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="SES DÜZEYİ">
+	<slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
index f910e1fe91..9480d30029 100644
--- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/>
-	<menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
new file mode 100644
index 0000000000..31404f2501
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
+	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
+	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Arkadaş ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Arkadaşları çıkar" name="remove_friends"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Sesi Engelle" name="block_unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+	<menu_item_call label="Grup Profili" name="group_profile"/>
+	<menu_item_call label="Grubu Etkinleştir" name="activate_group"/>
+	<menu_item_call label="Gruptan Ayrıl" name="leave_group"/>
+	<context_menu label="Moderatör Seçenekleri" name="Moderator Options">
+		<menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/>
+		<menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/>
+		<menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..9e91780eb8
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="Aİ..." name="IM"/>
+	<menu_item_call label="Sesli arama..." name="Call"/>
+	<menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/>
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="Invite"/>
+	<menu_item_call label="Harita" name="Map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..9a77eaadd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Tarihe göre sırala" name="sort_by_date"/>
+	<menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/>
+	<menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
new file mode 100644
index 0000000000..3b9738edce
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Sesi Engelle" name="Block/Unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..c4d4357ac9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Daraltılmış görünüm" name="compact_view"/>
+	<menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/>
+	<menu_item_check label="Zamanı göster" name="IMShowTime"/>
+	<menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 34a2661d8a..3d5c68d9d3 100644
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Nesne Profili..." name="Object Profile"/>
 	<menu_item_call label="Engelle..." name="Block"/>
+	<menu_item_call label="Haritada Göster" name="show_on_map"/>
+	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index d2e7e7107a..674041e9c9 100644
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Yeni Saç" name="New Hair"/>
 		<menu_item_call label="Yeni Gözler" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Tüm klasörleri genişlet" name="expand"/>
+	<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
 	<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
 	<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
new file mode 100644
index 0000000000..e9411ff350
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/>
+	<menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/>
+	<menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/>
+	<menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/>
+	<menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/>
+	<menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/>
+	<menu_item_check label="Sohbet günlüğü..." name="Conversation"/>
+	<menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/>
+	<menu_item_check label="Çeviri ayarları..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..2bf1101b48
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a869e2ae7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/>
+	<menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..14b3de3a9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Türe göre sırala" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..609584d6a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
+	<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
index 9f2946e310..743b01844d 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Bilgileri Görüntüle" name="View Info"/>
 	<menu_item_call label="Sohbet" name="Chat"/>
-	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Sesli arama" name="Call"/>
 	<menu_item_call label="Etkinleştir" name="Activate"/>
 	<menu_item_call label="Ayrıl" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..e550b20add
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index ee859a9450..2d61461c91 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Harita" name="Map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
index 5c89f87906..20695d98e8 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Arkadaş Ekle" name="Add Friends"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friends"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Ara" name="call"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..59ea7c145f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Haritayı Göster" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..02be715ed2
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index d82b52aea8..b14a0509bf 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Sakin Profilini Göster" name="show_agent"/>
+	<menu_item_call label="Profili Göster" name="show_agent"/>
+	<menu_item_call label="Aİ Gönder..." name="send_im"/>
+	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index d55e34c11c..00fa3c27c2 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/>
+	<menu_item_call label="Nesne Profili..." name="show_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 7a7faf6ac4..c465966fc7 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Durum" name="Status">
-			<menu_item_call label="Uzakta" name="Set Away"/>
-			<menu_item_call label="Meşgul" name="Set Busy"/>
-		</menu>
+		<menu label="Durum" name="Status"/>
 		<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="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
-		<menu_item_check label="Sohbet..." name="Nearby Chat"/>
+		<menu_item_check label="Sohbetler..." name="Conversations"/>
+		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
-		<menu_item_check label="Ses ayarları..." name="Nearby Voice"/>
-		<menu_item_check label="Ses şekillendirme..." name="ShowVoice"/>
+		<menu label="Ses şekillendirme" name="VoiceMorphing">
+			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
+			<menu_item_check label="Önizleme..." name="Preview"/>
+			<menu_item_call label="Abone ol..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
-		<menu_item_call label="Arkadaşlar" name="My Friends"/>
-		<menu_item_call label="Gruplar" name="My Groups"/>
-		<menu_item_call label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_check label="Arkadaşlar" name="My Friends"/>
+		<menu_item_check label="Gruplar" name="My Groups"/>
+		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
 		<menu_item_call label="Engelleme Listesi" name="Block List"/>
 	</menu>
 	<menu label="Dünya" name="World">
@@ -113,7 +114,6 @@
 			<menu_item_call label="Satın Al" name="Menu Object Buy"/>
 			<menu_item_call label="Al" name="Menu Object Take"/>
 			<menu_item_call label="Kopya Al" name="Take Copy"/>
-			<menu_item_call label="Envanterime Geri Kaydet" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Nesne İçeriklerine Geri Kaydet" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Nesneyi İade Et" name="Return Object back to Owner"/>
 		</menu>
@@ -128,6 +128,7 @@
 			<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Karakterler..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Görüntüleme / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Bölgeyi tekrar kaydet" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Seçenklr." name="Options">
 			<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
 	<menu label="Yardım" name="Help">
 		<menu_item_call label="Nasıl yapılır..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/>
+		<menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/>
+		<menu_item_call label="Bilgi Bankası" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Topluluk Forumları" name="Community Forums"/>
+		<menu_item_call label="Destek portalı" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] Haberleri" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/>
 		<menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/>
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
@@ -383,9 +391,14 @@
 				<menu_item_call label="Test Dişisi" name="Test Female"/>
 				<menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Animasyon Hızı" name="Animation Speed">
+				<menu_item_call label="Tüm Animasyonlar %10 Daha Hızlı" name="All Animations 10 Faster"/>
+				<menu_item_call label="Tüm Animasyonlar %10 Daha Yavaş" name="All Animations 10 Slower"/>
+				<menu_item_call label="Tüm Animasyon Hızlarını Sıfırla" name="Reset All Animation Speed"/>
+				<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/>
 			<menu_item_check label="Animasyon Bilgisi" name="Animation Info"/>
-			<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
 			<menu_item_check label="Şuraya Bak&apos;ı Göster" name="Show Look At"/>
 			<menu_item_check label="Şuraya İşaret Et&apos;i Göster" name="Show Point At"/>
 			<menu_item_check label="Eklem Güncelleştirmeleri İçin Hata Ayıklama" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 488702f9ca..ad92a4b478 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -516,6 +516,24 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -1546,10 +1564,13 @@ Gruptan ayrılmak istiyor musunuz?
 		Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Durumunuz Meşgul olarak ayarlandı.
-Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek.
-		<usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/>
+	<notification name="DoNotDisturbModeSet">
+		Rahatsız Etme açık.  Gelen iletişimlerle ilgili size bilgi verilmeyecek.
+
+- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler &gt; Genel içerisinde ayarlanır).
+- Işınlanma teklifleri reddedilecektir.
+- Sesli aramalar reddedilecektir.
+		<usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin.
@@ -2033,6 +2054,10 @@ Envanter öğesi/öğeleri taşınsın mı?
 		Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz?
 		<usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur.  Tüm katılımcılara yeni sohbet bildirimi gönderilir.
+		<usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/>
@@ -2107,14 +2132,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
 			<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
 		</form>
 	</notification>
-	<notification label="Meşgul Durumu Uyarısı" name="BusyModePay">
-		Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir.
+	<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
+		Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
 
-Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz?
+Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
 		<form name="form">
-			<ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/>
-			<button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/>
-			<button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/>
+			<ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/>
+			<button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/>
+			<button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 	<notification name="GroupNotice">
 		Konu: [SUBJECT], İleti: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimiçi
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimdışı
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; durumu: [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz.
@@ -2482,13 +2504,6 @@ Burada uçamazsınız.
 	<notification name="DynamicPathfindingDisabled">
 		Bu bölgede dinamik yol bulma etkin değil.  Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir.  Hareket eden başka nesnelerin doğru davranmasını sağlamak için “Bölgeyi yeniden kaydet” düğmesine tıklayın.  Daha fazla bilgi edinmek için “Yardım” seçimini yapın.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Yardım" ignoretext="Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir." name="okhelpignore" yestext="Tamam"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Bir hata meydana geldi.  Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz.  Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer.
 		<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2751,7 +2766,7 @@ Kabul ediyor musunuz?
 	<notification name="ScriptQuestionCaution">
 		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
   
-Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
+Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
 			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
@@ -3333,4 +3348,626 @@ Girişim iptal edildi.
 		[NUM_ITEMS] öğeyi siliyorsunuz.  Devam etmek istediğinize emin misiniz?
 		<usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar donduruldu.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] sizin dondurulmanızı kaldırdı.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar artık dondurulmuş değil.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Üzgünüz, bu kullanıcı dondurulamaz.
+	</notification>
+	<notification name="NowOwnObject">
+		Artık [OBJECT_NAME] nesnesinin sahibisiniz
+	</notification>
+	<notification name="CantRezOnLand">
+		[OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor.  Arazinin sahibini görmek için arazi aracını kullanın.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Çok fazla talep olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="SitFailCantMove">
+		Oturamazsınız çünkü şu anda hareket edemezsiniz.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Oturamazsınız çünkü bu araziye girme izniniz yok.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Daha yakına gelmeyi deneyin.  Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Yeni nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesi size aktarılamadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi navmesh&apos;e katkıda bulunduğu için kopyalama başarılamadı.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Kök nesne seçili olmayan kopya.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Nesneler çoğaltılamıyor çünkü bölge dolu.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Nesne oluşturulamıyor çünkü
+parsel dolu.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Bir nesneyi oluşturma girişimi başarısız oldu.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Bu envanter öğesi kara listeye alınmış.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Arazi Arama Engellendi.
+Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz.
+Lütfen bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız
+	</notification>
+	<notification name="EjectComingSoon">
+		Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Bu bölgeye giremezsiniz çünkü 
+sunucu dolu.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Envantere Geri Kaydet devre dışı bırakıldı.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		&apos;[DEST_NAME]&apos; nesnesini değiştirme izniniz olmadığı için &apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		&apos;[OBJ_NAME]&apos; envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoTransNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Benzeticiden &apos;[OBJ_NAME]&apos; nesnesinin kaldırılmasına izinler sistemi izin vermiyor.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoModNoTaking">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız.
+	</notification>
+	<notification name="RezDestInternalError">
+		Dahili Hata: Bilinmeyen hedef türü.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Nesne bulunamadığı için silme başarılamadı
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Üzgünüz, bu kullanıcı çıkartılamaz.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="HomeLocationLimits">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="HomePositionSet">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar çıkartıldı.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh&apos;i bölge sınırları ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Bu nesneyi değiştirme izniniz yok
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Navmesh&apos;e katkıda bulunan bir nesne için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Anahtar karelenmiş nesneler için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Fizik kaynağı maliyeti [MAX_OBJECTS]&apos;dan büyük nesne için fizik etkinleştirilemedi
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Bu nesne fantom olduğu ve navmesh&apos;e katkıda bulunduğu için konkav bir parçaya sahip olamaz.
+	</notification>
+	<notification name="UnableAddItem">
+		Öğe eklenemedi!
+	</notification>
+	<notification name="UnableEditItem">
+		Bu düzenlenemiyor!
+	</notification>
+	<notification name="NoPermToEdit">
+		Bunu düzenleme izni yok.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Bu envanteri kopyalama izni yok.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
+	</notification>
+	<notification name="TooManyScripts">
+		Çok fazla komut dosyası.
+	</notification>
+	<notification name="UnableAddScript">
+		Komut dosyası eklenemedi!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Varlık sunucusu zamanında yanıt vermedi.  Nesne sime iade edildi.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Bu bölgede fiziksel şekiller etkin değil.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Bu nesne türü üzerinde fizik özellikleri ayarlanamaz.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Kök prim şekilsiz olacak şekilde ayarlanamaz.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Bu bölgede fiziksel malzemeler etkin değil.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Sadece kök primlerin fizik malzemeleri ayarlanabilir.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Bir örgü nesnesinin dikiş türünü değiştiremezsiniz.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Bir örgü nesnesinin şeklini değiştiremezsiniz
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Bu bölgeye giremezsiniz çünkü \nbölge dolu.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Bağlantı başarısız oldu -- sahipler farklı
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Bağlntı başarılamadı -- navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Bağlantı başarısız oldu -- çok fazla ilkel öğe var
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Bağlantı başarısız oldu -- arazi kaynakları yetersiz
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		&apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedByAttachment">
+		You have been teleported by an attachment on [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Bilinmeyen bir sahibi olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Talep edilen nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Tek bir noktaya birden fazla nesne iliştiremezsiniz.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Burada birden fazla nesne oluşturamazsınız.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Bu arazide bitkiler oluşturamazsınız.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Nesne geri yüklenemiyor. Dünya konumu bulunamadı.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Örgü verileri geçersiz olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor.
+	</notification>
+	<notification name="CantCreateObject">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Geçersiz nesne parametreleri
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor.
+	</notification>
+	<notification name="CantChangeShape">
+		Bu şekli değiştirmenize izin verilmiyor.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Üzerinde bir avatar oturduğu için nesne iliştirilemiyor.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Ağaçlar ve çimen aksesuar olarak giyilemez.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Sahibi grup olan nesneler iliştirilemiyor.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Sahip olmadığınız nesneleri iliştiremezsiniz.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Navmesh&apos;e katkıda bulunan nesneler iliştirilemez.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Aksesuar düşürülemedi: Burada düşürme izniniz yok.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Nesne buraya düşürülemez.  Parsel dolu.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Lütfen silme parametrelerinizi daraltın.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Varlık karşıya yüklenemiyor.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Ana konuma ışınlanacak kullanıcı bulunamadı
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		tanrısal talep başarısız oldu
+	</notification>
+	<notification name="GenericRequestFailed">
+		genel talep başarısız oldu
+	</notification>
+	<notification name="CantUploadPostcard">
+		Posta kartı karşıya yüklenemiyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Grup bildirimi için envanter ayrıntıları alınamadı.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Grup bildirimi gönderilemedi -- izin verilmiyor.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Grup bildirimi gönderilemedi -- envanter oluşturulamadı.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Bildirimde envanter ayrıştırılamadı.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Yüzeyin karşıya yüklemesi başarılamadı.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Yüzey dosyası yazıldı.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor...
+	</notification>
+	<notification name="TerrainBaked">
+		Yüzey kaydedildi.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Satın alınamıyor, bu parsel satılık değil.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Bu parsel için yetkili alıcı değilsiniz.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -&gt; Hata Bildir ile bildirin...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Arazi bölündü.
+	</notification>
+	<notification name="PassPurchased">
+		Bir geçiş hakkı satın aldınız.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Bölgede seri ilanlara izin verilmiyor.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Bu arazi için geçiş hakkınız sona ermek üzere.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Burada oturacak yer yok, başka bir yer deneyin.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Grubun sahip olduğu araziyi devredemezsiniz.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Şu anda geçiş hakkı satın alınamıyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Nesne oluşturulamıyor çünkü \nparsel dolu.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Etkinlik için yer imi oluşturulamıyor.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Tanrısal güçleriniz dondurmayı devre dışı bıraktı!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi.
+	</notification>
+	<notification name="ExpireExplanation">
+		Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı.
+	</notification>
+	<notification name="DieExplanation">
+		Sistem talebinizi işleyemiyor.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		İlkel öğeyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="RezObjectFailure">
+		Nesneyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Ana konum sıfırlandı çünkü Ana konum yasal değildi.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="SetHomePosition">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Envanter hatasından ötürü nesne oluşturulması geri alınamıyor.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Talep edilen envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Talep edilen envanter klasörü oluşturulamadı.
+	</notification>
+	<notification name="CantCreateInventory">
+		Bu envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Yer imi oluşturulamıyor.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Envanter satılık değil.
+	</notification>
+	<notification name="CantFindInvItem">
+		Envanter öğesi bulunamıyor.
+	</notification>
+	<notification name="CantFindObject">
+		Nesne bulunamıyor.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Kime ödeme yapılacağı belirlenemedi.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Kamusal nesnelere L$ veremezsiniz.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Dünya içerisindeki nesnede envater oluşturma başarısız oldu.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik.  Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Başka oyuncularla kesişen büyük primler oluşturulamaz.  Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir.
+		<usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir.
+		<usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dosyalar taşınamıyor. Önceki yol geri yüklendi.
+		<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
index 7542778aca..f330bd85e8 100644
--- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/>
 	<icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/>
 	<icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
index 0464b7ec07..87b67e249e 100644
--- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Listeyi Engelle
-	</text>
-	<scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
-	<button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/>
-	<button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/>
-	<button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrele" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/>
+		<menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/>
+		<menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/>
+		<button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..c7227f02b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(yükleniyor)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..79895f9c21
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/>
+	<icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/>
+	<button name="delete_btn" tool_tip="Bu girişi kaldır"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
index 2bc597f2fa..f44d2b5e76 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Bilinmiyor"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 1a1e53bac2..08efd0aa61 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -14,81 +14,53 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_filtered_friends_msg">
 		Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin.
 	</string>
-	<string name="people_filter_label" value="Kişileri Filtrele"/>
-	<string name="groups_filter_label" value="Grupları Filtrele"/>
 	<string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/>
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
-	<filter_editor label="Filtrele" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
-		<panel label="ARKADAŞLARIM" name="friends_panel">
+		<panel label="ARKADAŞLAR" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="GRUPLARIM" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
-				<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
+		<panel label="GRUPLAR" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Grupları Filtrele" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/>
+				<menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
+				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
 			</panel>
 		</panel>
 		<panel label="SON" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
+		<panel label="ENGELLENMİŞ" name="blocked_panel">
+			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index 231e8fc5fe..aaeebdfe6e 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<text name="font_size">
-		Font büyüklüğü:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Küçük" name="radio" value="0"/>
-		<radio_item label="Orta" name="radio2" value="1"/>
-		<radio_item label="Büyük" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
-	<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
-	<check_box label="Düz metin Aİ&apos;ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/>
-	<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Aİ&apos;leri şurada göster:
-	</text>
-	<text name="requires_restart_label">
-		(tekrar başlatma gerekir)
-	</text>
-	<radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
-		<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
-		<radio_item label="Sekmeler" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Gelen sohbet için açılır pencereleri etkinleştir:
-	</text>
-	<check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/>
-	<check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/>
-	<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
-	<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
+		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
+		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Font büyüklüğü:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Küçük" name="Small" value="0"/>
+			<item label="Orta" name="Medium" value="1"/>
+			<item label="Büyük" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Bildirimler
+		</text>
+		<text name="friend_ims">
+			Arkadaş Aİ&apos;leri:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			Arkadaş harici Aİ&apos;ler:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			Konferans Aİ&apos;leri:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Grup sohbeti:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Yakındaki sohbet:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Sesi çal:
+		</text>
+		<check_box label="Yeni sohbet" name="new_conversation"/>
+		<check_box label="Gelen sesli arama" name="incoming_voice_call"/>
+		<check_box label="Işınlama teklifi" name="teleport_offer"/>
+		<check_box label="Envanter teklifi" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Günlüğü temizle..." name="clear_log"/>
+		<button label="Dökümleri sil..." name="delete_transcripts"/>
+		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
+	</panel>
 	<button label="Çeviri..." name="ok_btn"/>
 	<button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/>
 	<button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index 4a48b1588c..1a13cf8f71 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="asla" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Meşgul durumu cevabı:
+		Rahatsız Etme yanıtı:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index b0b9ab7716..9a4cf54fa7 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Nesneyi satın al" name="Buyobject"/>
 			<combo_box.item label="Nesneye ödeme yap" name="Payobject"/>
 			<combo_box.item label="Aç" name="Open"/>
+			<combo_box.item label="Yakınlaştır" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 1be8f5974c..155dc8749a 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=tr-TR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
@@ -619,8 +619,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AvatarAway">
 		Uzakta
 	</string>
-	<string name="AvatarBusy">
-		Meşgul
+	<string name="AvatarDoNotDisturb">
+		Rahatsız Etme
 	</string>
 	<string name="AvatarMuted">
 		Engellenmiş
@@ -856,6 +856,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ST_NO_JOINT">
 		KÖK veya EKLEM bulunamıyor.
 	</string>
+	<string name="NearbyChatTitle">
+		Yakındaki sohbet
+	</string>
+	<string name="NearbyChatLabel">
+		(Yakındaki sohbet)
+	</string>
 	<string name="whisper">
 		fısıldar:
 	</string>
@@ -919,12 +925,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ControlYourCamera">
 		Kameranızı kontrol etmek
 	</string>
-	<string name="TeleportYourAgent">
-		Sizi ışınlama
-	</string>
 	<string name="NotConnected">
 		Bağlı Değil
 	</string>
+	<string name="AgentNameSubst">
+		(Siz)
+	</string>
+	<string name="TeleportYourAgent">
+		Sizi ışınlama
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -1006,18 +1015,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="dictionary_files">
 		Sözlükler
 	</string>
-	<string name="AvatarSetNotAway">
-		Uzakta Değil
-	</string>
-	<string name="AvatarSetAway">
-		Uzakta
-	</string>
-	<string name="AvatarSetNotBusy">
-		Meşgul Değil
-	</string>
-	<string name="AvatarSetBusy">
-		Meşgul
-	</string>
 	<string name="shape">
 		Şekil
 	</string>
@@ -1986,8 +1983,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="PanelContentsNewScript">
 		Yeni Komut Dosyası
 	</string>
-	<string name="BusyModeResponseDefault">
-		İleti gönderdiğiniz Sakin &apos;meşgul modu&apos;nda, bu da rahatsız edilmek istemediği anlamına geliyor.  İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir.
+	<string name="DoNotDisturbModeResponseDefault">
+		Bu sakin &quot;Rahatsız Etme&quot; seçeneğini devreye almış, mesajınızı sonra görecek.
 	</string>
 	<string name="MuteByName">
 		(Adına göre)
@@ -2100,9 +2097,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		İçerik
-	</string>
 	<string name="AcquiredItems">
 		Alınan Öğeler
 	</string>
@@ -3874,7 +3868,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Genel Bölge
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor
+		Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir.
@@ -3951,6 +3945,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="IM_unblock_only_groups_friends">
 		Bu mesajı görmek için Tercihler/Gizlilik&apos;de &apos;Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin&apos; seçeneğinin işaretini kaldırmalısınız.
 	</string>
+	<string name="OnlineStatus">
+		Çevrimiçi
+	</string>
+	<string name="OfflineStatus">
+		Çevrimdışı
+	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
@@ -3960,6 +3960,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="you_joined_call">
 		Sesli aramaya katıldınız
 	</string>
+	<string name="you_auto_rejected_call-im">
+		&quot;Rahatsız Etme&quot; seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz.
+	</string>
 	<string name="name_started_call">
 		[NAME] bir sesli arama başlattı
 	</string>
@@ -3976,7 +3979,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Bağlanıyor...
 	</string>
 	<string name="conference-title">
-		Özel Konferans
+		Çok kişili sohbet
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] ile konferans
@@ -4866,6 +4869,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Label">
 		Sohbet
 	</string>
+	<string name="Command_Conversations_Label">
+		Sohbetler
+	</string>
 	<string name="Command_Compass_Label">
 		Pusula
 	</string>
@@ -4941,6 +4947,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Tooltip">
 		Metin kullanarak yakındaki kişilerle sohbet etmek
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Herkesle sohbet et
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Pusula
 	</string>
@@ -5070,4 +5079,13 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
new file mode 100644
index 0000000000..37115a0310
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="交談記錄">
+	<panel name="buttons_panel">
+		<filter_editor label="人員過濾器" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
+		<menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ece263f440
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="交談：">
+	<floater.string name="Title">
+		交談：[NAME]
+	</floater.string>
+	<text name="page_label" value="頁"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 2d66c659fe..84ad869100 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談"/>
+<multi_floater name="floater_im_box" title="交談">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
+					<button name="add_btn" tool_tip="開始新的交談"/>
+					<button name="speak_btn" tool_tip="用麥克風和大家交談"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
+					<text name="stub_textbox">
+						這個交談另開了新視窗。   [secondlife:/// 把它收回來]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index 808a0b6720..d63c5507db 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="至" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
+	<floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
+	<floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
+	<floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<button name="add_btn" tool_tip="新增某人到這個交談"/>
+				<button name="voice_call_btn" tool_tip="建立語音通聯"/>
+				<button name="close_btn" tool_tip="結束這個交談"/>
+				<button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="至" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 45a003d3c8..4526eff21d 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
+		如果接聽，你將切斷目前的語音交談。
 	</text>
-	<button label="接受" label_selected="接受" name="Accept"/>
-	<button label="拒絕" label_selected="拒絕" name="Reject"/>
-	<button label="開始 IM" name="Start IM"/>
+	<button label="接聽" label_selected="接聽" name="Accept"/>
+	<button label="忽視" label_selected="忽視" name="Reject"/>
+	<button label="不接聽但開啟 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index be009b54d8..d0978b8b01 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				顯示：
 			</text>
-			<check_box label="世界" name="show_world"/>
+			<check_box label="測試" name="show_world"/>
 			<check_box label="僅限可移動的" name="show_world_movables_only"/>
 			<check_box label="導航網面" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index e909a67e2c..02d06323d4 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="預設" label_selected="預設" name="Default"/>
 	<button label="空白" label_selected="空白" name="Blank"/>
 	<button label="無" label_selected="無" name="None"/>
-	<check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="已停用預覽"/>
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..96caa7d333
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="語音聊天音量">
+	<slider label="語音聊天" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index 81e0204262..aab5fa6028 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲">
+<floater label="地點" name="voice_effects" title="語音變聲試聽">
 	<string name="no_voice_effect">
 		（無變聲效果）
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
new file mode 100644
index 0000000000..4260a8d331
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="音量">
+	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index cd069f9601..eb7093a23c 100644
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
-	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
+	<menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
new file mode 100644
index 0000000000..507255d0c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="關閉交談" name="close_conversation"/>
+	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
+	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="新增朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="禁止語音" name="block_unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+	<menu_item_call label="群組檔案" name="group_profile"/>
+	<menu_item_call label="啟用群組" name="activate_group"/>
+	<menu_item_call label="離開群組" name="leave_group"/>
+	<context_menu label="主持人選項" name="Moderator Options">
+		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
+		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
+		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..49e91417e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM…" name="IM"/>
+	<menu_item_call label="語音通話…" name="Call"/>
+	<menu_item_call label="開啟聊天歷史…" name="Chat history"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="Invite"/>
+	<menu_item_call label="地圖" name="Map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..3fa99a5cd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依日期排序" name="sort_by_date"/>
+	<menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
+	<menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
new file mode 100644
index 0000000000..815b0b594c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="加為朋友" name="Add Friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="禁止語音" name="Block/Unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..a7006e524a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="精簡視野" name="compact_view"/>
+	<menu_item_check label="全展視野" name="expanded_view"/>
+	<menu_item_check label="顯示時間" name="IMShowTime"/>
+	<menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index f4f93b0bdc..9655732f2e 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="物件檔案..." name="Object Profile"/>
 	<menu_item_call label="封鎖…" name="Block"/>
+	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
+	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index e85b4b7182..258d0d6b20 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="新頭髮" name="New Hair"/>
 		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="展開全部資料夾" name="expand"/>
+	<menu_item_call label="摺疊全部資料夾" name="collapse"/>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
new file mode 100644
index 0000000000..8b35860eb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
+	<menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
+	<menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
+	<menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
+	<menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
+	<menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
+	<menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
+	<menu_item_check label="交談記錄……" name="Conversation"/>
+	<menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
+	<menu_item_check label="翻譯設定……" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..9a2a3c403d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="解除封鎖" name="unblock"/>
+	<menu_item_call label="檔案..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a8cecb4e14
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
+	<menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..5b70cd35bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依類型排序" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
new file mode 100644
index 0000000000..4251238fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依狀態排序" name="sort_status"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看許可權限" name="view_permissions"/>
+	<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index 5768c554c9..b4b566f5ca 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="語音通話" name="Call"/>
 	<menu_item_call label="啟動" name="Activate"/>
 	<menu_item_call label="退出" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
new file mode 100644
index 0000000000..05a30d938f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 38d5f3d324..d25adaf8fb 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="地圖" name="Map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="檢視聊天歷史……" name="chat_history"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 1380e0b307..69f0eab7dc 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="加為朋友" name="Add Friends"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friends"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="通話" name="call"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..9bc5638472
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依距離排序" name="sort_distance"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看地圖" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
new file mode 100644
index 0000000000..382234c3ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近排序" name="sort_most"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 592bb6561e..72629822d4 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示居民檔案" name="show_agent"/>
+	<menu_item_call label="察看檔案" name="show_agent"/>
+	<menu_item_call label="送出 IM..." name="send_im"/>
+	<menu_item_call label="加為朋友..." name="add_friend"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index b344b21c62..9f3a9d58ff 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示物件資訊" name="show_object"/>
+	<menu_item_call label="物件檔案..." name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ac0e9e7e35..09bdc57819 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
 			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="狀態" name="Status">
-			<menu_item_call label="離開" name="Set Away"/>
-			<menu_item_call label="忙碌" name="Set Busy"/>
-		</menu>
+		<menu label="狀態" name="Status"/>
 		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
 		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
 		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_check label="聊天…" name="Nearby Chat"/>
+		<menu_item_check label="交談……" name="Conversations"/>
+		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
 		<menu_item_check label="說話" name="Speak"/>
-		<menu_item_check label="語音設定…" name="Nearby Voice"/>
-		<menu_item_check label="語音變聲…" name="ShowVoice"/>
+		<menu label="語音變聲" name="VoiceMorphing">
+			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
+			<menu_item_check label="預覽……" name="Preview"/>
+			<menu_item_call label="訂閱……" name="Subscribe"/>
+		</menu>
 		<menu_item_check label="姿勢…" name="Gestures"/>
-		<menu_item_call label="朋友" name="My Friends"/>
-		<menu_item_call label="群組" name="My Groups"/>
-		<menu_item_call label="附近的人群" name="Active Speakers"/>
+		<menu_item_check label="朋友" name="My Friends"/>
+		<menu_item_check label="群組" name="My Groups"/>
+		<menu_item_check label="附近的人群" name="Active Speakers"/>
 		<menu_item_call label="封鎖清單" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -113,7 +114,6 @@
 			<menu_item_call label="購買" name="Menu Object Buy"/>
 			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
-			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
@@ -128,6 +128,7 @@
 			<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
+			<menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
 	<menu label="幫助" name="Help">
 		<menu_item_call label="簡易教學…" name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
+		<menu_item_call label="使用者指南" name="User’s guide"/>
+		<menu_item_call label="知識庫" name="Knowledge Base"/>
+		<menu_item_call label="維基" name="Wiki"/>
+		<menu_item_call label="社群論壇" name="Community Forums"/>
+		<menu_item_call label="支援入口" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
 		<menu_item_call label="違規舉報" name="Report Abuse"/>
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
@@ -383,9 +391,14 @@
 				<menu_item_call label="女性測試" name="Test Female"/>
 				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="動作速度" name="Animation Speed">
+				<menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/>
+				<menu_item_check label="慢動作" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
-			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
 			<menu_item_check label="顯示指向在" name="Show Point At"/>
 			<menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 9fecf2c104..59be26d43b 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -516,6 +516,24 @@
 		</url>
 		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=tw
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
 	<notification name="UnknownGPU">
 		你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
 原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。  這大概不會出問題，但你可能需要調整顯像設定。
@@ -1536,10 +1554,13 @@ SHA1 指紋：[MD5_DIGEST]
 		此時無法發出交友邀請。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="BusyModeSet">
-		已設為忙碌模式。
-聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。
-		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
+	<notification name="DoNotDisturbModeSet">
+		「請勿打擾」模式目前是開啟狀態。  你將不會收到任何發給你的訊息通知。
+
+- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 &gt; 一般設定」）。
+- 所有瞬間傳送的邀請都將被婉拒。
+- 所有語音來電都將拒絕接聽。
+		<usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。
@@ -2024,6 +2045,10 @@ SHA1 指紋：[MD5_DIGEST]
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
 		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		新增一個人到現有的交談，等於建立新的交談。  所有交談者將會收到新交談通知。
+		<usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
 		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
@@ -2098,14 +2123,14 @@ SHA1 指紋：[MD5_DIGEST]
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="忙碌模式警告" name="BusyModePay">
-		你現在處於忙碌模式，這意味著你付費後仍將不會收到任何物項。
+	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
+		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
 
-你是否要先離開忙碌模式，再完成交易？
+是否要在完成交易之前，先關閉「請勿打擾」模式？
 		<form name="form">
-			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
-			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
-			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
+			<ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/>
+			<button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
+			<button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2240,11 +2265,8 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="GroupNotice">
 		主旨：[SUBJECT]，訊息：[MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前在線上
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前離線
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		雖然你人很好，你還是不能把自己加為朋友。
@@ -2472,13 +2494,6 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="DynamicPathfindingDisabled">
 		這地區並未啟用動態尋徑。  使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		更改本地區的某些物件將導致其他移動物件的運作發生問題。  要使移動物件正常運作，請點按「重新產出地區」按鈕。  欲獲知詳情請選擇「幫助」。
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		發生錯誤。  問題可能出在網路或伺服器，也可能因為你無權建製物件。  有時，只要登出再登入即能解決這類問題。
 		<usetemplate name="okbutton" yestext="確定"/>
@@ -2741,7 +2756,7 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ScriptQuestionCaution">
 		警告：物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。
   
-這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
+如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
 		<form name="form">
 			<button name="Grant" text="允許全權存取"/>
 			<button name="Deny" text="拒絕"/>
@@ -3323,4 +3338,633 @@ SHA1 指紋：[MD5_DIGEST]
 		你正在刪除 [NUM_ITEMS] 個物項。  你確定你要繼續？
 		<usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		化身已凍結。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] 解除了對你的凍結。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		化身已解除凍結。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		凍結失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		你遭凍結的時間已過，請恢復正常活動。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		抱歉，無法凍結該用戶。
+	</notification>
+	<notification name="NowOwnObject">
+		你現在是物件 [OBJECT_NAME] 的所有人
+	</notification>
+	<notification name="CantRezOnLand">
+		無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。  請用土地工具察看所有人。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		無法產生物件，此刻要求數目過多。
+	</notification>
+	<notification name="SitFailCantMove">
+		你無法坐下，因為此刻你不能移動。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		你不能坐下，因為該土地不允許。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		請挨近一點。  無法坐在物件上，因為
+它和你不在同一個地區。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		無法建立新物件。 地區已滿載。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		你無法在別人的土地上建立樹和草。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		複製失敗，你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		選取了沒有根的重覆物件。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		無法複製物件，因為地區滿載。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		無法複製物件，找不到它們所在的地段。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		無法建立物件，因為 
+地段滿載。
+	</notification>
+	<notification name="RezAttemptFailed">
+		試圖產生物件失敗。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		無法建立已在此地區造成問題的物件。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		該收納區物項已被列入黑名單。
+	</notification>
+	<notification name="NoCanRezObjects">
+		你此時無權建立物件。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地搜尋遭禁。
+你在短時間內進行了太多次土地搜尋。
+請稍候再試。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		你已經死亡並且被瞬間傳送回你的家的位置
+	</notification>
+	<notification name="EjectComingSoon">
+		你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。
+	</notification>
+	<notification name="NoEnterServerFull">
+		你無法進入這地區，因為 
+伺服器滿載。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「儲存回收納區」功能已被停用。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容，因為產生它的來源物件已不存在。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		無法儲存 [OBJ_NAME] 到物件內容，你無權修改 &apos;[DEST_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區，此動作已被停用。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		無法複製你所選的，因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoTransNoCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		無法儲存你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		無法儲存你所選的，因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
+	</notification>
+	<notification name="NoModNoTaking">
+		無法拿取你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="RezDestInternalError">
+		內部錯誤：未知的目的地類型。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		刪除失敗，因為找不到物件
+	</notification>
+	<notification name="SorryCantEjectUser">
+		抱歉，無法踢出該用戶。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="HomeLocationLimits">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="HomePositionSet">
+		我的家位置已定。
+	</notification>
+	<notification name="AvatarEjected">
+		化身已被踢出。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		踢出失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]）
+	</notification>
+	<notification name="NoPermModifyObject">
+		你無權變更該物件
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		對導航網面有貢獻的物件，無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		鍵格動畫物件無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		無法啟用物件的物理——土地資源不足。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。
+	</notification>
+	<notification name="UnableAddItem">
+		無法新增項目！
+	</notification>
+	<notification name="UnableEditItem">
+		無法編輯這項目！
+	</notification>
+	<notification name="NoPermToEdit">
+		無權編輯這項目。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		無權複製該收納區。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		無法儲存到物件內容：該項目已不存在。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		無法儲存到物件內容：收納區已存在同名稱的項目
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		無法儲存到物件內容：這麼做將修改附件的權限。
+	</notification>
+	<notification name="TooManyScripts">
+		腳本太多。
+	</notification>
+	<notification name="UnableAddScript">
+		無法新增腳本！
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資產伺服器未在正常時間內反應。  物件已返交模擬器。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		本地區未啟用物理形狀。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		你無法變更跨越地區界限的導航網面。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		該物件類型不得設定物理性質。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		根幾何元件無法設成無形狀。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		本地區未啟用物理材料。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		只能調整根幾何元件的物理材料。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		尚不支援角色設定物理材料。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定的物理材料屬性中，至少有一個無效。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		網面物件的縫合類型不得變更。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		網面物件的形狀不得變更。
+	</notification>
+	<notification name="FullRegionCantEnter">
+		你無法進入這地區，\n因為地區滿載。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		聯結失敗——所有人不同
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		聯結失敗——無法修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		聯結失敗，你無權編輯。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		聯結失敗——幾何元件太多
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		聯結失敗——沒有可聯結的東西。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		聯結失敗——尋徑角色太多
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		聯結失敗——土地資源不足
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		物件使用了過多物理資源，其動態特性已被停用。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
+	</notification>
+	<notification name="TeleportedByAttachment">
+		你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		無法建立要求的物件。 地區已滿載。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		你不能將多個物件附著到同一個點。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		你不能在此建立多個物件。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		無法建立要求的物件。 物件在資料庫中找不到。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		無法建立要求的物件。 要求逾時，無法完成。 請再試一次。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		無法建立要求的物件。 請再試一次。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		物件產生失敗，要求的物件載入時間太久。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		你不得在這土地上建立植物。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		無法恢復物件。 找不到虛擬世界的位置。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		無法產生物件，它的網面資料無效。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		無法產生物件，因為這地區已有太多的腳本。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		你無權在此建立物件。
+	</notification>
+	<notification name="CantCreateObject">
+		你此時無權建立物件。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無效的物件參數
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		你權限不夠，無法在此複製物件。
+	</notification>
+	<notification name="CantChangeShape">
+		你無權變更這個形狀。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		你權限不夠，無法在此收取物件。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		讓渡失敗，你無權為你的群組讓渡物件。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		你權限不夠，無法在此購買物件。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		無法附著物件，有個化身正坐在物件上。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		樹和草不能當附件穿戴。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		無法附著群組所擁有的物件。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		無法附著不是你擁有的物件。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		無法附著對導航網面有貢獻的物件。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		無法附著物件，你無權移動該物件。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		你無法在此卸除物件，請到「自由嘗試」區域再試。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		卸除附件失敗：你無權在此處卸除。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		卸除附件失敗：可用土地資源不足。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		卸除附件失敗：可用資源不足。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		無法在此卸除物件。  地段滿載。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		無法觸摸/抓取此物件，因為你在該土地地段遭禁。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		請將刪除參數範圍調小一點。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		無法上傳資產。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		找不到要瞬間傳送到家的用戶
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		要求神的權力失敗
+	</notification>
+	<notification name="GenericRequestFailed">
+		普通請求失敗
+	</notification>
+	<notification name="CantUploadPostcard">
+		無法上傳明信片。  請稍候再試一次。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		無法取得群組通知的收納區細節。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		無法送出群組通知——未准許。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		無法送出群組通知——收納區建立失敗。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		無法剖析通知裡的收納品項。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形上傳失敗。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形檔案已寫入。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形檔案已寫入，開始下載……
+	</notification>
+	<notification name="TerrainBaked">
+		地形已定貌。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		你必須先更新瀏覽器後，才可購買這個地段。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		無法購買，此地段不供出售。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		無法購買，售價或土地面積已變。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		你不是此地段的獲授權的買主。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		你無法購買此地段，該地段已在等候批准購買
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		你不得在此建立物件，這麼做將導致地段超載。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		未選取足夠租用地段，無法合併。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地分割成功。
+	</notification>
+	<notification name="PassPurchased">
+		你購買了通行權。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		地區不允許分類廣告。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		你在此土地的通行權即將到期失效。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		沒有合適的表面讓你坐下，請試一試別處。
+	</notification>
+	<notification name="CantSitNoRoom">
+		這裡沒有空間讓你坐下，請試試另一處。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		收取物件失敗，因為你權限不足。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		收取物件失敗，因為你 L$ 金額不足。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		無法讓渡群組所擁有的土地。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		購買物件失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		購買收納區失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		你的 L$ 不足，無法購買此土地的通行權。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		此時無法購買通行權。  請稍候再試一次。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		無法建立物件，\n地段滿載。
+	</notification>
+	<notification name="FailedPlacingObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		無法為活動建立地標。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		你擁有的神力解除了凍結！
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		要求特殊能力失敗。 該要求已載入記錄。
+	</notification>
+	<notification name="ExpireExplanation">
+		系統此時無法處理你的要求。 要求逾時，無法完成。
+	</notification>
+	<notification name="DieExplanation">
+		系統無法處理你的要求。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		金額不足，無法建立幾何元件。
+	</notification>
+	<notification name="RezObjectFailure">
+		金額不足，無法建立物件。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		已重設「我的家」位置，因為前一個位置不合法。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="SetHomePosition">
+		我的家位置已定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		收納區出錯，無法收納物件。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		無法建立要求的收納區。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		無法建立要求的收納區資料夾。
+	</notification>
+	<notification name="CantCreateInventory">
+		無法建立該收納區。
+	</notification>
+	<notification name="CantCreateLandmark">
+		無法建立地標。
+	</notification>
+	<notification name="CantCreateOutfit">
+		此時無法建立裝扮。 請過一分鐘後再試。
+	</notification>
+	<notification name="InventoryNotForSale">
+		收納區沒有待售。
+	</notification>
+	<notification name="CantFindInvItem">
+		找不到收納區物項。
+	</notification>
+	<notification name="CantFindObject">
+		找不到物件。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		此地區目前未啟用轉移金錢給物件的功能。
+	</notification>
+	<notification name="CantPayNoAgent">
+		無法決定付款給誰。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		你無法將 L$ 送給公共物件。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		針對虛擬世界物件建立收納區失敗。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		發生內部錯誤，我們無法如常更新你的瀏覽器。  你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		無法建立和其他參與者發生交截的大型幾何元件。  請等其他參與者移開後再試。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		這動作將刪除先前交談的記錄，和所有記錄備份。
+		<usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
+		<usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		無法移動檔案。 已恢復前一個路徑。
+		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index 1c8b56b3d6..e0a49a0add 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
 	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
 	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 1dfa024138..9f59bb32f8 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		封鎖清單
-	</text>
-	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
-	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
-	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
-	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="過濾器" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
+		<menu_button name="view_btn" tool_tip="排序選項"/>
+		<menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/>
+		<button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..6524d41645
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（載入中）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..8446ce2130
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="包含語音交談"/>
+	<icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
+	<button name="delete_btn" tool_tip="移除此項目"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index 175293cdf7..fec4bb572a 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 59ea7b70e2..5f7aca387a 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
-	<string name="people_filter_label" value="人員過濾器"/>
-	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
-	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
-		<panel label="我的朋友" name="friends_panel">
+		<panel label="朋友" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人員過濾器" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="我的群組" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+		<panel label="群組" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="群組過濾器" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人員過濾器" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
+		<panel label="已封鎖的" name="blocked_panel">
+			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index cf2f81d313..e700e35516 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<text name="font_size">
-		字型尺寸：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
-	<check_box label="聊天泡泡" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		顯示 IMs 於：
-	</text>
-	<text name="requires_restart_label">
-		（須重新啟動）
-	</text>
-	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
-		<radio_item label="分開視窗" name="radio" value="0"/>
-		<radio_item label="頁籤" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		啟用傳入聊天的突顯示視窗：
-	</text>
-	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
-	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
-	<spinner label="附近聊天內容提示框停駐時間：" name="nearby_toasts_lifetime"/>
-	<spinner label="附近聊天內容提示框消退時間：" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+		<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			字型尺寸：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="聊天泡泡" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			通知
+		</text>
+		<text name="friend_ims">
+			朋友 IM：
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			非朋友 IM：
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="conference_ims">
+			多方交談 IM：
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="group_chat">
+			群組聊天：
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="nearby_chat">
+			附近的聊天：
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="notifications_alert">
+			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			播放聲音：
+		</text>
+		<check_box label="新交談" name="new_conversation"/>
+		<check_box label="語音通話來電" name="incoming_voice_call"/>
+		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
+		<check_box label="收納物品贈送" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="清空記錄……" name="clear_log"/>
+		<button label="刪除交談內容記錄……" name="delete_transcripts"/>
+		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
+	</panel>
 	<button label="翻譯…" name="ok_btn"/>
 	<button label="自動取代…" name="autoreplace_showgui"/>
 	<button label="拼字檢查…" name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 7e67a0d02d..044edbed70 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		忙碌模式回應：
+		「請勿打擾」預設回應：
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 982dde4010..60f44a3d88 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="購買物件" name="Buyobject"/>
 			<combo_box.item label="支付物件" name="Payobject"/>
 			<combo_box.item label="打開" name="Open"/>
+			<combo_box.item label="縮放" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 7e17ed6864..31713ac281 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="AvatarAway">
 		離開
 	</string>
-	<string name="AvatarBusy">
-		忙碌
+	<string name="AvatarDoNotDisturb">
+		請勿打擾
 	</string>
 	<string name="AvatarMuted">
 		封鎖的
@@ -851,6 +851,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ST_NO_JOINT">
 		找不到 ROOT 或旋軸。
 	</string>
+	<string name="NearbyChatTitle">
+		附近的聊天中
+	</string>
+	<string name="NearbyChatLabel">
+		（附近的聊天）
+	</string>
 	<string name="whisper">
 		低語：
 	</string>
@@ -914,12 +920,15 @@ http://secondlife.com/viewer-access-faq
 	<string name="ControlYourCamera">
 		控制你的攝影機
 	</string>
-	<string name="TeleportYourAgent">
-		瞬間傳送你本人
-	</string>
 	<string name="NotConnected">
 		未聯接
 	</string>
+	<string name="AgentNameSubst">
+		（你）
+	</string>
+	<string name="TeleportYourAgent">
+		瞬間傳送你本人
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -1001,18 +1010,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="dictionary_files">
 		字典
 	</string>
-	<string name="AvatarSetNotAway">
-		非離開
-	</string>
-	<string name="AvatarSetAway">
-		離開
-	</string>
-	<string name="AvatarSetNotBusy">
-		非忙碌
-	</string>
-	<string name="AvatarSetBusy">
-		忙碌
-	</string>
 	<string name="shape">
 		體形
 	</string>
@@ -1981,8 +1978,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="PanelContentsNewScript">
 		新腳本
 	</string>
-	<string name="BusyModeResponseDefault">
-		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
+	<string name="DoNotDisturbModeResponseDefault">
+		這居民處於「請勿打擾」狀態，不會立即看到你的訊息。
 	</string>
 	<string name="MuteByName">
 		（按名稱）
@@ -2095,9 +2092,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		內容
-	</string>
 	<string name="AcquiredItems">
 		取得物品
 	</string>
@@ -3869,7 +3863,7 @@ http://secondlife.com/viewer-access-faq
 		一般普級地區
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		可看到本地段外的化身，並與之交談
+		這地段外的其他化身，看不見也聽不到位於地段裡的化身
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地區重新產出之前，可移動物件可能無法正常運作。
@@ -3946,6 +3940,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="IM_unblock_only_groups_friends">
 		要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
 	</string>
+	<string name="OnlineStatus">
+		上線
+	</string>
+	<string name="OfflineStatus">
+		離線
+	</string>
 	<string name="answered_call">
 		你的通話已經接通
 	</string>
@@ -3955,6 +3955,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="you_joined_call">
 		你發起了語音通話
 	</string>
+	<string name="you_auto_rejected_call-im">
+		因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。
+	</string>
 	<string name="name_started_call">
 		[NAME] 發起了語音通話
 	</string>
@@ -3971,7 +3974,7 @@ http://secondlife.com/viewer-access-faq
 		聯接中...
 	</string>
 	<string name="conference-title">
-		臨時多方通話
+		多人聊天
 	</string>
 	<string name="conference-title-incoming">
 		和 [AGENT_NAME] 多方通話
@@ -4863,6 +4866,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Label">
 		聊天
 	</string>
+	<string name="Command_Conversations_Label">
+		交談
+	</string>
 	<string name="Command_Compass_Label">
 		羅盤
 	</string>
@@ -4938,6 +4944,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Tooltip">
 		透過文字和附近人們聊天
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		和所有人交談
+	</string>
 	<string name="Command_Compass_Tooltip">
 		指南針
 	</string>
@@ -5067,4 +5076,13 @@ http://secondlife.com/viewer-access-faq
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
+	</string>
 </strings>
-- 
cgit v1.2.3


From f1affa28972d3b746274380825bb9c72ede03daa Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 9 Apr 2013 19:21:48 +0300
Subject: CHUI-922 FIXED Panel width was increased

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 08ecc37d21..f8ab2dbcbb 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -273,7 +273,7 @@
             <layout_panel
              top_delta="0"
              top="0"
-             height="26"
+             height="30"
              bottom="-1"
              auto_resize="false"
              user_resize="false"
-- 
cgit v1.2.3


From 1d3f018e812daf5fb7834258940b13a2239106b4 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 9 Apr 2013 17:04:57 -0700
Subject: MAINT-2417 FIX Update Graphics tab layout

---
 .../default/xui/en/panel_preferences_graphics1.xml | 96 +++++++++++++++++++---
 1 file changed, 86 insertions(+), 10 deletions(-)

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

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 4ed95f0758..7abc67494f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -177,10 +177,86 @@
      width="80">
         Ultra
     </text>
+  <slider
+   control_name="RenderAvatarLODFactor"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   follows="left|top"
+   height="16"
+   increment="0.125"
+   initial_value="160"
+   label="Avatar detail:"
+   label_width="90"
+   layout="topleft"
+   left="30"
+   name="AvatarMeshDetail2"
+   show_text="false"
+   top="72"
+   width="300">
+    <slider.commit_callback
+     function="Pref.UpdateSliderText"
+     parameter="AvatarMeshDetailText2" />
+  </slider>
+  <text
+   type="string"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   name="AvatarMeshDetailText2"
+   top_delta="0"
+   left_delta="304"
+   width="128">
+    Low
+  </text>
+  <slider
+   control_name="RenderFarClip"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   decimal_digits="0"
+   follows="left|top"
+   height="16"
+   increment="8"
+   initial_value="160"
+   label="Draw distance:"
+   label_width="90"
+   layout="topleft"
+   left="30"
+   max_val="512"
+   min_val="64"
+   name="DrawDistance"
+   top="110"
+   width="330" />
+  <text
+   type="string"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left_delta="330"
+   name="DrawDistanceMeterText2"
+   top_delta="0"
+   width="128">
+    m
+  </text>
+  <check_box
+		 control_name="RenderDeferred"
+     invisiblity_control="ShowAdvancedGraphicsSettings"
+		 height="16"
+		 initial_value="true"
+		 label="Lighting and Shadows"
+		 layout="topleft"
+		 left="30"
+		 name="UseLightShaders2"
+		 top="148"
+		 width="256">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
     <panel
-	 visiblity_control="ShowAdvancedGraphicsSettings"
+	   visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
-	 follows="top|left"
+	   follows="top|left"
      height="300"
      label="CustomGraphics"
      layout="topleft"
@@ -219,15 +295,15 @@
 		 left_delta="0"
 		 name="BumpShiny"
 		 top_pad="1"
-		width="256" />
+		 width="256" />
     <check_box
-		control_name="RenderLocalLights"
-		height="16"
-		initial_value="true"
-		label="Local Lights"
-		layout="topleft"
-		left_delta="0"
-		name="LocalLights"
+		 control_name="RenderLocalLights"
+		 height="16"
+		 initial_value="true"
+		 label="Local Lights"
+		 layout="topleft"
+		 left_delta="0"
+		 name="LocalLights"
 		 top_pad="1"
 		 width="256" />
 		  <check_box
-- 
cgit v1.2.3


From 8025b8b2bc6028ed268e191d432cb3f740e351db Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 15 Apr 2013 13:16:14 -0500
Subject: NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where
 available

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5af02a238f..364c1df999 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2359,6 +2359,12 @@
                 <menu_item_check.on_click
                  function="Advanced.ToggleFrameTest" />
             </menu_item_check>
+          <menu_item_call
+             label="Frame Profile"
+             name="Frame Profile">
+            <menu_item_call.on_click
+             function="Advanced.ClickRenderProfile" />
+          </menu_item_call>
         </menu>
       <menu
         create_jump_keys="true"
-- 
cgit v1.2.3


From 98f438656b3f4ae8a0b6fbd6327cfff3ef243545 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Mon, 15 Apr 2013 16:29:14 -0700
Subject: MAINT-2548 : Add debug viewer render info for AV metrics.  Reviewed
 by Kelly

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1197f1ce1f..f66272aa2e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2205,6 +2205,16 @@
                 <menu_item_check.on_click
                  function="ToggleControl"
                  parameter="DebugShowRenderInfo" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Avatar Render Info"
+             name="Show Avatar Render Info">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowAvatarRenderInfo" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowAvatarRenderInfo" />
             </menu_item_check>
 			  <menu_item_check
              label="Show Texture Info"
-- 
cgit v1.2.3


From 0193a7b74ccc09788e8d2503244f30ac231546cc Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 16 Apr 2013 04:55:09 +0300
Subject: CHUI-808 FIXED Draggable separator between conversations and message
 pane is not discoverable:  - final solution;

---
 .../skins/default/xui/en/floater_im_container.xml  | 100 +++++++++++----------
 .../skins/default/xui/en/floater_im_session.xml    |  88 ++++++++----------
 2 files changed, 86 insertions(+), 102 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 65f623a47e..3e8c6c76cc 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -25,23 +25,27 @@
     <layout_stack
      animate="true" 
      bottom="-1"
+     drag_handle_gap="6"
+     drag_handle_first_indent="27"
+     drag_handle_second_indent="10"
      follows="all"
      layout="topleft"
      left="0"
      name="conversations_stack"
      orientation="horizontal"
      right="-1"
+     show_drag_handle="true"
      top="0">
         <layout_panel
          auto_resize="false"
          user_resize="true"        
          name="conversations_layout_panel"
          min_dim="38"
-         expanded_min_dim="156">
+         expanded_min_dim="136">
             <layout_stack
              animate="false" 
              follows="left|top|right"
-             height="35"
+             height="27"
              layout="topleft"
              left="0"
              name="conversations_pane_buttons_stack"
@@ -50,7 +54,6 @@
              top="0">
                 <layout_panel
                  auto_resize="true"
-                 height="35"
                  name="conversations_pane_buttons_expanded">
                     <menu_button
                      follows="top|left"
@@ -64,7 +67,7 @@
                      left="5"
                      name="sort_btn"
                      tool_tip="View/sort options"
-                     top="5"
+                     top="1"
                      width="31" />
                     <button
                      follows="top|left"
@@ -74,7 +77,7 @@
                      image_selected="Toolbar_Middle_Selected"
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
-                     top="5"
+                     top="1"
                      left_pad="2"
                      name="add_btn"
                      tool_tip="Start a new conversation"
@@ -87,7 +90,7 @@
                      image_selected="Toolbar_Middle_Selected"
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
-                     top="5"
+                     top="1"
                      left_pad="2"
                      name="speak_btn"
                      tool_tip="Speak with people using your microphone"
@@ -95,9 +98,8 @@
                 </layout_panel>
                 <layout_panel
                  auto_resize="false"
-                 height="35"
                  name="conversations_pane_buttons_collapsed"
-                 width="41">
+                 width="31">
                     <button
                      follows="right|top"
                      height="25"
@@ -106,8 +108,8 @@
                      image_selected="Toolbar_Middle_Selected"
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
-                     top="5"
-                     left="1"
+                     top="1"
+                     left="0"
                      name="expand_collapse_btn"
                      tool_tip="Collapse/Expand this list"
                      width="31" />
@@ -119,7 +121,7 @@
              layout="topleft"
              name="conversations_list_panel"
              opaque="true"
-             top="35"
+             top_pad="0"
              left="5"
              right="-1"/>
         </layout_panel>
@@ -127,7 +129,7 @@
          auto_resize="true"
          user_resize="true"
          name="messages_layout_panel"
-         expanded_min_dim="222">
+         expanded_min_dim="232">
             <panel_container
              bottom="-1"
              follows="all"
@@ -136,44 +138,44 @@
              name="im_box_tab_container"
              right="-1"
              top="0">
-             <panel
-               bottom="-1"
-               follows="all"
-               layout="topleft"
-               name="stub_panel"
-               opaque="true"
-               top_pad="0"
-               left="0"
-               right="-1">
-                 <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Conv_toolbar_collapse"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
+                <panel
+                 bottom="-1"
+                 follows="all"
                  layout="topleft"
-                 top="5"
-                 right="-10"
-                 name="stub_collapse_btn"
-                 tool_tip="Collapse this pane"
-                 width="31" />
-                 <text
-                   type="string"
-                   clip_partial="false"
-                   follows="left|top|right"
-                   layout="topleft"
-                   left="15"
-                   right="-15"
-                   name="stub_textbox"
-                   top="25"
-                   height="40"
-                   valign="center"
-                   parse_urls="true"
-                   wrap="true">
-                   This conversation is in a separate window.   [secondlife:/// Bring it back.]
-                 </text>
-             </panel>
+                 name="stub_panel"
+                 opaque="true"
+                 top_pad="0"
+                 left="0"
+                 right="-1">
+                    <button
+                     follows="right|top"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_collapse"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="1"
+                     right="-10"
+                     name="stub_collapse_btn"
+                     tool_tip="Collapse this pane"
+                     width="31" />
+                    <text
+                     type="string"
+                     clip_partial="false"
+                     follows="left|top|right"
+                     layout="topleft"
+                     left="15"
+                     right="-15"
+                     name="stub_textbox"
+                     top="25"
+                     height="40"
+                     valign="center"
+                     parse_urls="true"
+                     wrap="true">
+                         This conversation is in a separate window.   [secondlife:/// Bring it back.]
+                    </text>
+                </panel>
             </panel_container>
         </layout_panel>
     </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index f8ab2dbcbb..c0ed2e6a78 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -70,27 +70,23 @@
      top="0"
      left="0"
      right="-1"
-     bottom="-3">
+     bottom="-1">
         <layout_stack
          animate="false" 
+         bottom="-1"
          default_tab_group="2"
          follows="all"
-         right="-5"
-         bottom="-1"
-         top="0"
          left="3"
-         border_size="0"
          layout="topleft"
-         orientation="vertical"
          name="main_stack"
-         tab_group="1">
+         right="-3"
+         orientation="vertical"
+         tab_group="1"
+         top="0">
             <layout_panel
              auto_resize="false"
-             user_resize="false"
              name="toolbar_panel"
-             height="35"
-             right="-1"
-             left="1">
+             height="25">
                 <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
@@ -103,7 +99,7 @@
                  left="5"
                  name="view_options_btn"
                  tool_tip="View/sort options"
-                 top="5"
+                 top="1"
                  width="31" />
                 <menu_button
                  menu_filename="menu_im_conversation.xml"
@@ -114,7 +110,7 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
+                 top="1"
                  left_pad="2"
                  name="gear_btn"
                  visible="false"
@@ -129,7 +125,7 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
+                 top="1"
                  left_pad="2"
                  name="add_btn"
                  tool_tip="Add someone to this conversation"
@@ -142,7 +138,7 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
+                 top="1"
                  left_pad="2"
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
@@ -167,8 +163,8 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
-                 right="-67"
+                 top="1"
+                 right="-70"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
@@ -180,7 +176,7 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 top="5"
+                 top="1"
                  left_pad="2"
                  name="expand_collapse_btn"
                  tool_tip="Collapse/Expand this pane"
@@ -195,20 +191,21 @@
                  layout="topleft"
                  left_pad="2"
                  name="tear_off_btn"
-                 top="5"
+                 top="1"
                  width="31" />
             </layout_panel>
             <layout_panel
              name="body_panel"
-             top="1"
-             bottom="-1"
-             auto_resize="true"
-             user_resize="false">
+             height="235">
                 <layout_stack
                  default_tab_group="2"
+                 drag_handle_gap="6"
+                 drag_handle_first_indent="0"
+                 drag_handle_second_indent="1"
                  follows="all"
                  orientation="horizontal"
                  name="im_panels"
+                 show_drag_handle="true"
                  tab_group="1"
                  top="0"
                  right="-1"
@@ -220,14 +217,12 @@
                      min_dim="0"
                      width="150" 
                      user_resize="true"
-                     auto_resize="false" 
-                     bottom="-1" />
+                     auto_resize="false" />
                     <layout_panel
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="221"
-                     bottom="-1">
+                     min_width="221">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
@@ -236,7 +231,7 @@
                          name="translate_and_chat_stack"
                          tab_group="1"
                          top="0"
-                         left="0"
+                         left="1"
                          right="-1"
                          bottom="-1">
                             <layout_panel
@@ -262,7 +257,7 @@
                                  parse_highlights="true"
                                  parse_urls="true"
                                  right="-1"
-                                 left="5"
+                                 left="0"
                                  top="0"
                                  bottom="-1" />
                             </layout_panel>
@@ -271,12 +266,8 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             top_delta="0"
-             top="0"
-             height="30"
-             bottom="-1"
+             height="35"
              auto_resize="false"
-             user_resize="false"
              name="chat_layout_panel">
                 <layout_stack
                  animate="false"
@@ -285,15 +276,11 @@
                  orientation="horizontal"
                  name="input_panels"
                  top="0"
-                 bottom="-2"
+                 bottom="-1"
                  left="0"
                  right="-1">
                     <layout_panel
-                     name="input_editor_layout_panel"
-                     auto_resize="true"
-                     user_resize="false"
-                     top="0"
-                     bottom="-1">
+                     name="input_editor_layout_panel">
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -306,32 +293,27 @@
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         top="1"
-                         bottom="-2"
-                         left="4"
-                         right="-4"
+                         bottom="-8"
+                         left="5"
+                         right="-5"
                          wrap="true" />
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
-                     user_resize="false"
                      name="input_button_layout_panel"
-                     width="30"
-                     top="0"
-                     bottom="-1">
+                     width="32">
                         <button
-                         layout="topleft"
                          left="1"
-                         right="-1"
-                         top="1"
-                         height="22"
+                         top="4"
+                         height="25"
                          follows="left|right|top"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_overlay="Conv_expand_one_line"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
                          name="minz_btn"
-                         tool_tip="Shows/hides message panel" />
+                         tool_tip="Shows/hides message panel"
+                         width="28" />
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
-- 
cgit v1.2.3


From 35ede26097161ec9ab02dd0228ae9c95fce941ee Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 17 Apr 2013 16:46:32 -0500
Subject: NORSPEC-128 Edit glossiness and environment as U8's from [0,255], as
 they are stored

---
 .../newview/skins/default/xui/en/panel_tools_texture.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 5e2caa28a9..042134a8c6 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -392,12 +392,13 @@
                 Glossiness
             </text>
             <spinner
-             decimal_digits="3"
-             min_value="0"
-             max_value="1"
+             decimal_digits="0"
+             min_val="0"
+             max_val="255"
              follows="left|top"
              height="19"
-             initial_value="0.2"
+             initial_value="51"
+             increment="1"
              layout="topleft"
              top_delta="-4"
              left_pad="10"
@@ -417,9 +418,10 @@
                 Environment
             </text>
             <spinner
-             decimal_digits="3"
-             min_value="0"
-             max_value="1"
+             decimal_digits="0"
+             min_val="0"
+             max_val="255"
+             increment="1"
              follows="left|top"
              height="19"
              initial_value="0"
-- 
cgit v1.2.3


From df7596e9015ea7f190d5ebb96587dd23d37bf1f8 Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Tue, 23 Apr 2013 18:51:26 +0300
Subject: CHUI-950 (Reduce min width of messages panel )

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_im_session.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 3e8c6c76cc..a56b90a29d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -129,7 +129,7 @@
          auto_resize="true"
          user_resize="true"
          name="messages_layout_panel"
-         expanded_min_dim="232">
+         expanded_min_dim="183">
             <panel_container
              bottom="-1"
              follows="all"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index c0ed2e6a78..8da4213c65 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -222,7 +222,7 @@
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="221">
+                     min_width="172">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
-- 
cgit v1.2.3


From 1744d2150b68db5dce17aa2ca1a106393409ff3c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 23 Apr 2013 16:19:31 -0400
Subject: NORSPEC-132 Correct rotation limits to +/- 180 for all textures

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 042134a8c6..678b4f43cd 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -644,8 +644,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="9999"
-             min_val="-9999"
+             max_val="180"
+             min_val="-180"
              name="bumpyRot"
              width="265" />
 
@@ -707,8 +707,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="9999"
-             min_val="-9999"
+             max_val="180"
+             min_val="-180"
              name="shinyRot"
              width="265" />
 
-- 
cgit v1.2.3


From 80772aa1ad62a89129f24508e2005b20fec88854 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:49:11 -0700
Subject: sync with viewer-development (per DRTVWR-309)

---
 .../default/xui/de/floater_conversation_log.xml    |   8 -
 .../xui/de/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/de/floater_im_container.xml  |  29 +-
 .../skins/default/xui/de/floater_im_session.xml    |  61 +-
 .../skins/default/xui/de/floater_incoming_call.xml |  10 +-
 .../default/xui/de/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/de/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/de/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/de/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/de/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/de/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/de/menu_conversation.xml     |  31 -
 .../default/xui/de/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/de/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/de/menu_im_conversation.xml  |  15 -
 .../default/xui/de/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/de/menu_object_icon.xml      |   2 -
 .../skins/default/xui/de/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/de/menu_participant_view.xml |  13 -
 .../default/xui/de/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/de/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/de/menu_people_blocked_view.xml    |   5 -
 .../default/xui/de/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/de/menu_people_groups.xml    |   2 +-
 .../default/xui/de/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/de/menu_people_nearby.xml    |  23 +-
 .../xui/de/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/de/menu_people_nearby_view.xml     |   8 -
 .../default/xui/de/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/de/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/de/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/de/notifications.xml | 690 +-------------------
 .../default/xui/de/panel_avatar_list_item.xml      |   1 -
 .../default/xui/de/panel_block_list_sidetray.xml   |  15 +-
 .../xui/de/panel_conversation_list_item.xml        |   8 -
 .../xui/de/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/de/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/de/panel_people.xml  |  88 ++-
 .../default/xui/de/panel_preferences_chat.xml      | 110 +---
 .../default/xui/de/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/de/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/de/strings.xml     |  68 +-
 .../skins/default/xui/en/floater_im_session.xml    |  62 +-
 .../skins/default/xui/en/menu_attachment_other.xml |   8 +
 .../skins/default/xui/en/menu_attachment_self.xml  |   8 +
 .../skins/default/xui/en/menu_avatar_other.xml     |   8 +
 .../skins/default/xui/en/menu_avatar_self.xml      |   8 +
 indra/newview/skins/default/xui/en/menu_login.xml  |  15 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  11 +-
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 .../default/xui/es/floater_conversation_log.xml    |   8 -
 .../xui/es/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/es/floater_im_container.xml  |  29 +-
 .../skins/default/xui/es/floater_im_session.xml    |  61 +-
 .../skins/default/xui/es/floater_incoming_call.xml |  10 +-
 .../default/xui/es/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/es/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/es/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/es/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/es/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/es/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/es/menu_conversation.xml     |  31 -
 .../default/xui/es/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/es/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/es/menu_im_conversation.xml  |  15 -
 .../default/xui/es/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/es/menu_object_icon.xml      |   2 -
 .../skins/default/xui/es/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/es/menu_participant_view.xml |  13 -
 .../default/xui/es/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/es/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/es/menu_people_blocked_view.xml    |   5 -
 .../default/xui/es/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/es/menu_people_groups.xml    |   2 +-
 .../default/xui/es/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/es/menu_people_nearby.xml    |  23 +-
 .../xui/es/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/es/menu_people_nearby_view.xml     |   8 -
 .../default/xui/es/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/es/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/es/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml |  35 +-
 .../newview/skins/default/xui/es/notifications.xml | 692 +--------------------
 .../default/xui/es/panel_avatar_list_item.xml      |   1 -
 .../default/xui/es/panel_block_list_sidetray.xml   |  15 +-
 .../xui/es/panel_conversation_list_item.xml        |   8 -
 .../xui/es/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/es/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/es/panel_people.xml  |  88 ++-
 .../default/xui/es/panel_preferences_chat.xml      | 110 +---
 .../default/xui/es/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/es/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/es/strings.xml     |  63 +-
 .../default/xui/fr/floater_conversation_log.xml    |   8 -
 .../xui/fr/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/fr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/fr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/fr/floater_incoming_call.xml |  10 +-
 .../default/xui/fr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/fr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/fr/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/fr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/fr/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/fr/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/fr/menu_conversation.xml     |  31 -
 .../default/xui/fr/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/fr/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/fr/menu_im_conversation.xml  |  15 -
 .../default/xui/fr/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/fr/menu_object_icon.xml      |   2 -
 .../skins/default/xui/fr/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/fr/menu_participant_view.xml |  13 -
 .../default/xui/fr/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/fr/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/fr/menu_people_blocked_view.xml    |   5 -
 .../default/xui/fr/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/fr/menu_people_groups.xml    |   2 +-
 .../default/xui/fr/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/fr/menu_people_nearby.xml    |  23 +-
 .../xui/fr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/fr/menu_people_nearby_view.xml     |   8 -
 .../default/xui/fr/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/fr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/fr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/fr/notifications.xml | 690 +-------------------
 .../default/xui/fr/panel_avatar_list_item.xml      |   1 -
 .../default/xui/fr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/fr/panel_conversation_list_item.xml        |   8 -
 .../xui/fr/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/fr/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/fr/panel_people.xml  |  88 ++-
 .../default/xui/fr/panel_preferences_chat.xml      | 110 +---
 .../default/xui/fr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/fr/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/fr/strings.xml     |  68 +-
 .../default/xui/it/floater_conversation_log.xml    |   8 -
 .../xui/it/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/it/floater_im_container.xml  |  29 +-
 .../skins/default/xui/it/floater_im_session.xml    |  61 +-
 .../skins/default/xui/it/floater_incoming_call.xml |  10 +-
 .../default/xui/it/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/it/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/it/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/it/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/it/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/it/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/it/menu_conversation.xml     |  31 -
 .../default/xui/it/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/it/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/it/menu_im_conversation.xml  |  15 -
 .../default/xui/it/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/it/menu_object_icon.xml      |   2 -
 .../skins/default/xui/it/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/it/menu_participant_view.xml |  13 -
 .../default/xui/it/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/it/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/it/menu_people_blocked_view.xml    |   5 -
 .../default/xui/it/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/it/menu_people_groups.xml    |   2 +-
 .../default/xui/it/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/it/menu_people_nearby.xml    |  23 +-
 .../xui/it/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/it/menu_people_nearby_view.xml     |   8 -
 .../default/xui/it/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/it/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/it/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/it/notifications.xml | 692 +--------------------
 .../default/xui/it/panel_avatar_list_item.xml      |   1 -
 .../default/xui/it/panel_block_list_sidetray.xml   |  15 +-
 .../xui/it/panel_conversation_list_item.xml        |   8 -
 .../xui/it/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/it/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/it/panel_people.xml  |  88 ++-
 .../default/xui/it/panel_preferences_chat.xml      | 110 +---
 .../default/xui/it/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/it/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/it/strings.xml     |  63 +-
 .../default/xui/ja/floater_conversation_log.xml    |   8 -
 .../xui/ja/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/ja/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ja/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |  10 +-
 .../default/xui/ja/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/ja/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |  31 -
 .../default/xui/ja/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/ja/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/ja/menu_im_conversation.xml  |  15 -
 .../default/xui/ja/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/ja/menu_object_icon.xml      |   2 -
 .../skins/default/xui/ja/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/ja/menu_participant_view.xml |  13 -
 .../default/xui/ja/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/ja/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/ja/menu_people_blocked_view.xml    |   5 -
 .../default/xui/ja/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/ja/menu_people_groups.xml    |   2 +-
 .../default/xui/ja/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/ja/menu_people_nearby.xml    |  23 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |   8 -
 .../default/xui/ja/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/ja/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/ja/notifications.xml | 686 +-------------------
 .../default/xui/ja/panel_avatar_list_item.xml      |   1 -
 .../default/xui/ja/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ja/panel_conversation_list_item.xml        |   8 -
 .../xui/ja/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/ja/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/ja/panel_people.xml  |  90 ++-
 .../default/xui/ja/panel_preferences_chat.xml      | 110 +---
 .../default/xui/ja/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/ja/strings.xml     |  68 +-
 .../default/xui/pt/floater_conversation_log.xml    |   8 -
 .../xui/pt/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/pt/floater_im_container.xml  |  29 +-
 .../skins/default/xui/pt/floater_im_session.xml    |  61 +-
 .../skins/default/xui/pt/floater_incoming_call.xml |   8 +-
 .../default/xui/pt/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/pt/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/pt/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/pt/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/pt/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/pt/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/pt/menu_conversation.xml     |  31 -
 .../default/xui/pt/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/pt/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/pt/menu_im_conversation.xml  |  15 -
 .../default/xui/pt/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/pt/menu_object_icon.xml      |   2 -
 .../skins/default/xui/pt/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/pt/menu_participant_view.xml |  13 -
 .../default/xui/pt/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/pt/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/pt/menu_people_blocked_view.xml    |   5 -
 .../default/xui/pt/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/pt/menu_people_groups.xml    |   2 +-
 .../default/xui/pt/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/pt/menu_people_nearby.xml    |  23 +-
 .../xui/pt/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/pt/menu_people_nearby_view.xml     |   8 -
 .../default/xui/pt/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/pt/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/pt/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/pt/notifications.xml | 690 +-------------------
 .../default/xui/pt/panel_avatar_list_item.xml      |   1 -
 .../default/xui/pt/panel_block_list_sidetray.xml   |  15 +-
 .../xui/pt/panel_conversation_list_item.xml        |   8 -
 .../xui/pt/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/pt/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/pt/panel_people.xml  |  88 ++-
 .../default/xui/pt/panel_preferences_chat.xml      | 110 +---
 .../default/xui/pt/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/pt/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/pt/strings.xml     |  63 +-
 .../default/xui/ru/floater_conversation_log.xml    |   8 -
 .../xui/ru/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/ru/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ru/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ru/floater_incoming_call.xml |  10 +-
 .../default/xui/ru/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ru/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ru/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/ru/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ru/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/ru/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/ru/menu_conversation.xml     |  31 -
 .../default/xui/ru/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/ru/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/ru/menu_im_conversation.xml  |  15 -
 .../default/xui/ru/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/ru/menu_object_icon.xml      |   2 -
 .../skins/default/xui/ru/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/ru/menu_participant_view.xml |  13 -
 .../default/xui/ru/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/ru/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/ru/menu_people_blocked_view.xml    |   5 -
 .../default/xui/ru/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/ru/menu_people_groups.xml    |   2 +-
 .../default/xui/ru/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/ru/menu_people_nearby.xml    |  23 +-
 .../xui/ru/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ru/menu_people_nearby_view.xml     |   8 -
 .../default/xui/ru/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/ru/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ru/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/ru/notifications.xml | 689 +-------------------
 .../default/xui/ru/panel_avatar_list_item.xml      |   1 -
 .../default/xui/ru/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ru/panel_conversation_list_item.xml        |   8 -
 .../xui/ru/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/ru/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/ru/panel_people.xml  |  88 ++-
 .../default/xui/ru/panel_preferences_chat.xml      | 110 +---
 .../default/xui/ru/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ru/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/ru/strings.xml     |  66 +-
 .../default/xui/tr/floater_conversation_log.xml    |   8 -
 .../xui/tr/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/tr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/tr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/tr/floater_incoming_call.xml |  10 +-
 .../default/xui/tr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/tr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/tr/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/tr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/tr/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/tr/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/tr/menu_conversation.xml     |  31 -
 .../default/xui/tr/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/tr/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/tr/menu_im_conversation.xml  |  15 -
 .../default/xui/tr/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/tr/menu_object_icon.xml      |   2 -
 .../skins/default/xui/tr/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/tr/menu_participant_view.xml |  13 -
 .../default/xui/tr/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/tr/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/tr/menu_people_blocked_view.xml    |   5 -
 .../default/xui/tr/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/tr/menu_people_groups.xml    |   2 +-
 .../default/xui/tr/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/tr/menu_people_nearby.xml    |  23 +-
 .../xui/tr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/tr/menu_people_nearby_view.xml     |   8 -
 .../default/xui/tr/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/tr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/tr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/tr/notifications.xml | 683 +-------------------
 .../default/xui/tr/panel_avatar_list_item.xml      |   1 -
 .../default/xui/tr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/tr/panel_conversation_list_item.xml        |   8 -
 .../xui/tr/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/tr/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/tr/panel_people.xml  |  88 ++-
 .../default/xui/tr/panel_preferences_chat.xml      | 110 +---
 .../default/xui/tr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/tr/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/tr/strings.xml     |  68 +-
 .../default/xui/zh/floater_conversation_log.xml    |   8 -
 .../xui/zh/floater_conversation_preview.xml        |   7 -
 .../skins/default/xui/zh/floater_im_container.xml  |  29 +-
 .../skins/default/xui/zh/floater_im_session.xml    |  61 +-
 .../skins/default/xui/zh/floater_incoming_call.xml |   8 +-
 .../default/xui/zh/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/zh/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/zh/floater_voice_chat_volume.xml   |   4 -
 .../skins/default/xui/zh/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/zh/floater_voice_volume.xml  |   8 -
 .../newview/skins/default/xui/zh/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/zh/menu_conversation.xml     |  31 -
 .../default/xui/zh/menu_conversation_log_gear.xml  |  15 -
 .../default/xui/zh/menu_conversation_log_view.xml  |   7 -
 .../skins/default/xui/zh/menu_im_conversation.xml  |  15 -
 .../default/xui/zh/menu_im_session_showmodes.xml   |   7 -
 .../skins/default/xui/zh/menu_object_icon.xml      |   2 -
 .../skins/default/xui/zh/menu_outfit_gear.xml      |   2 -
 .../skins/default/xui/zh/menu_participant_view.xml |  13 -
 .../default/xui/zh/menu_people_blocked_gear.xml    |   5 -
 .../default/xui/zh/menu_people_blocked_plus.xml    |   5 -
 .../default/xui/zh/menu_people_blocked_view.xml    |   5 -
 .../default/xui/zh/menu_people_friends_view.xml    |   8 -
 .../skins/default/xui/zh/menu_people_groups.xml    |   2 +-
 .../default/xui/zh/menu_people_groups_view.xml     |   4 -
 .../skins/default/xui/zh/menu_people_nearby.xml    |  23 +-
 .../xui/zh/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/zh/menu_people_nearby_view.xml     |   8 -
 .../default/xui/zh/menu_people_recent_view.xml     |   6 -
 .../skins/default/xui/zh/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/zh/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/zh/notifications.xml | 690 +-------------------
 .../default/xui/zh/panel_avatar_list_item.xml      |   1 -
 .../default/xui/zh/panel_block_list_sidetray.xml   |  15 +-
 .../xui/zh/panel_conversation_list_item.xml        |   8 -
 .../xui/zh/panel_conversation_log_list_item.xml    |   6 -
 .../skins/default/xui/zh/panel_group_list_item.xml |   1 -
 .../newview/skins/default/xui/zh/panel_people.xml  |  88 ++-
 .../default/xui/zh/panel_preferences_chat.xml      | 110 +---
 .../default/xui/zh/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/zh/strings.xml     |  66 +-
 395 files changed, 1802 insertions(+), 10393 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/de/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_log.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_voice_volume.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_im_conversation.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_participant_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
deleted file mode 100644
index 19620a0fc9..0000000000
--- a/indra/newview/skins/default/xui/de/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL">
-	<panel name="buttons_panel">
-		<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
deleted file mode 100644
index 010ad19076..0000000000
--- a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="UNTERHALTUNG:">
-	<floater.string name="Title">
-		UNTERHALTUNG: [NAME]
-	</floater.string>
-	<text name="page_label" value="Seite"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 5bf916c8e9..95eda97938 100644
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="GESPRÄCHE">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-					<button name="add_btn" tool_tip="Neue Unterhaltung starten"/>
-					<button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/>
-					<text name="stub_textbox">
-						Diese Unterhaltung erscheint in einem separaten Fenster.   [secondlife:/// Zurückholen.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="GESPRÄCHE"/>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index f96eb72cb1..abaf275651 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/>
-	<floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/>
-	<floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/>
-	<floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/>
-	<floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/>
-	<floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/>
-				<button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/>
-				<button name="close_btn" tool_tip="Diese Unterhaltung beenden"/>
-				<button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="An" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="An" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index f13842f479..213d9f54f5 100644
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		Anonym
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ruft Sie an.
+		ruft an.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ist einem Voice-Konferenz-Chat beigetreten.
@@ -25,9 +25,9 @@
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
-		Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet.
+		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</text>
-	<button label="Annehmen" label_selected="Annehmen" name="Accept"/>
-	<button label="Ignorieren" label_selected="Ignorieren" name="Reject"/>
-	<button label="Stattdessen IM öffnen" name="Start IM"/>
+	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
+	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
+	<button label="IM starten" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index 88e9f53a4c..ebf8f01632 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Anzeigen:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Welt" name="show_world"/>
 			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index b794d879f0..9585622516 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Leer" label_selected="Leer" name="Blank"/>
 	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Live-Vorschau" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vorschau deaktiviert"/>
 	<filter_editor label="Texturen filtern" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
deleted file mode 100644
index 15259639e8..0000000000
--- a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE">
-	<slider label="Voice-Chat" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 8d37950480..413a46525c 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
+<floater label="Orte" name="voice_effects" title="VOICE MORPHING">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
deleted file mode 100644
index 258627c94f..0000000000
--- a/indra/newview/skins/default/xui/de/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="LAUTSTÄRKE">
-	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
index 2dd871b2ea..54b218d22f 100644
--- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
-	<menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
deleted file mode 100644
index 30d3ab79e1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
-	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
-	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
-	<menu_item_call label="Profil anzeigen" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
-	<menu_item_call label="Voice-Anruf" name="voice_call"/>
-	<menu_item_call label="Chatverlauf..." name="chat_history"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
-	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Karte" name="map"/>
-	<menu_item_call label="Freigeben" name="share"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_check label="Voice ignorieren" name="block_unblock"/>
-	<menu_item_check label="Text ignorieren" name="MuteText"/>
-	<menu_item_call label="Gruppenprofil" name="group_profile"/>
-	<menu_item_call label="Gruppe aktivieren" name="activate_group"/>
-	<menu_item_call label="Gruppe verlassen" name="leave_group"/>
-	<context_menu label="Moderatoroptionen" name="Moderator Options">
-		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
-		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
-		<menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
deleted file mode 100644
index 2ef8762128..0000000000
--- a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Voice-Anruf..." name="Call"/>
-	<menu_item_call label="Chatverlauf öffnen..." name="Chat history"/>
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="In Gruppe einladen..." name="Invite"/>
-	<menu_item_call label="Karte" name="Map"/>
-	<menu_item_call label="Freigeben" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
deleted file mode 100644
index ae3cc5bc97..0000000000
--- a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
-	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
-	<menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/>
-	<menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
deleted file mode 100644
index 875524b19d..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
-	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
-	<menu_item_call label="Chatverlauf..." name="chat_history"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Karte" name="map"/>
-	<menu_item_call label="Freigeben" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
-	<menu_item_check label="Text ignorieren" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
deleted file mode 100644
index 48f62d29a1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Kompaktansicht" name="compact_view"/>
-	<menu_item_check label="Erweiterte Ansicht" name="expanded_view"/>
-	<menu_item_check label="Zeit anzeigen" name="IMShowTime"/>
-	<menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index f92fa0f82b..8b6c558416 100644
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Objektprofil..." name="Object Profile"/>
 	<menu_item_call label="Ignorieren..." name="Block"/>
-	<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
-	<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index 0cf3c09882..d56c93533c 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Neues Haar" name="New Hair"/>
 		<menu_item_call label="Neue Augen" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Alle Ordner erweitern" name="expand"/>
-	<menu_item_call label="Alle Ordner schließen" name="collapse"/>
 	<menu_item_call label="Outfit neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml
deleted file mode 100644
index 6ceb9ac4c5..0000000000
--- a/indra/newview/skins/default/xui/de/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/>
-	<menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/>
-	<menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/>
-	<menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/>
-	<menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/>
-	<menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/>
-	<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/>
-	<menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/>
-	<menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
deleted file mode 100644
index f69a453e58..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Nicht mehr ignorieren" name="unblock"/>
-	<menu_item_call label="Profil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
deleted file mode 100644
index 041fde139d..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/>
-	<menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
deleted file mode 100644
index 1dae593ebe..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
-	<menu_item_check label="Nach Typ sortieren" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
deleted file mode 100644
index da4890fe96..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
-	<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
index a69c82d3d8..76225ba241 100644
--- a/indra/newview/skins/default/xui/de/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Info anzeigen" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Voice-Anruf" name="Call"/>
+	<menu_item_call label="Anrufen" name="Call"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Verlassen" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
deleted file mode 100644
index 20386bba56..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index cdbb3ae917..1db964357f 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil anzeigen" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
-	<menu_item_call label="Voice-Anruf" name="voice_call"/>
-	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Karte" name="map"/>
-	<menu_item_call label="Freigeben" name="share"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Karte" name="Map"/>
+	<menu_item_call label="Teilen" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index ba6578e2d1..b6e99edfe1 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
-	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Anrufen" name="call"/>
-	<menu_item_call label="Freigeben" name="share"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
+	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Teilen" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
deleted file mode 100644
index d38ec65037..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Karte anzeigen" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
deleted file mode 100644
index a116ad0bc1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach jüngsten sortieren" name="sort_most"/>
-	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index c61ebb0eae..9a808088fb 100644
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profil anzeigen" name="show_agent"/>
-	<menu_item_call label="IM senden..." name="send_im"/>
-	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
+	<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 77b7004e44..90d3763d9c 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Objektprofil..." name="show_object"/>
+	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 2c9d9fa7f1..845df1f050 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status"/>
+		<menu label="Status" name="Status">
+			<menu_item_call label="Abwesend" name="Set Away"/>
+			<menu_item_call label="Beschäftigt" name="Set Busy"/>
+		</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="Kontoübersicht..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
-		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
-		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
+		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
-		<menu label="Voice-Morphing" name="VoiceMorphing">
-			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
-			<menu_item_check label="Vorschau..." name="Preview"/>
-			<menu_item_call label="Abonnieren..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/>
+		<menu_item_check label="Voice-Morphing..." name="ShowVoice"/>
 		<menu_item_check label="Gesten..." name="Gestures"/>
-		<menu_item_check label="Freunde" name="My Friends"/>
-		<menu_item_check label="Gruppen" name="My Groups"/>
-		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_call label="Freunde" name="My Friends"/>
+		<menu_item_call label="Gruppen" name="My Groups"/>
+		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
 	</menu>
 	<menu label="Welt" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Kaufen" name="Menu Object Buy"/>
 			<menu_item_call label="Nehmen" name="Menu Object Take"/>
 			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
+			<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Objekt zurückgeben" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
-		<menu_item_call label="Benutzerhandbuch" name="User’s guide"/>
-		<menu_item_call label="Knowledge Base" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Community-Foren" name="Community Forums"/>
-		<menu_item_call label="Support-Portal" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
@@ -393,14 +385,9 @@
 				<menu_item_call label="Weiblich testen" name="Test Female"/>
 				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Animationsgeschwindigkeit" name="Animation Speed">
-				<menu_item_call label="Alle Animationen 10 % schneller" name="All Animations 10 Faster"/>
-				<menu_item_call label="Alle Animationen 10 % langsamer" name="All Animations 10 Slower"/>
-				<menu_item_call label="Alle Animationsgeschwindigkeiten zurücksetzen" name="Reset All Animation Speed"/>
-				<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
 			<menu_item_check label="Animations-Info" name="Animation Info"/>
+			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
 			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
 			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
 			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index dc0d7dc6b4..4b7a60b4eb 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -523,24 +523,6 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
-
-    Unter [_URL] nach aktualisierten Treibern suchen?
-		<url name="url">
-			http://support.amd.com/de/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
-
-    Unter [_URL] nach aktualisierten Treibern suchen?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=de-de
-		</url>
-		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -1576,13 +1558,10 @@ Diese Gruppe verlassen?
 		Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Nicht-stören-Modus ist aktiviert:  Sie erhalten keine Benachrichtigung über eingehende Kommunikation.
-
-- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen &gt; Allgemein).
-- Teleport-Angebote werden abgelehnt.
-- Voice-Anrufe werden abgelehnt.
-		<usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Beschäftigt-Modus ist aktiviert.
+Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben.
+		<usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab.
@@ -2070,10 +2049,6 @@ Inventarobjekt(e) verschieben?
 		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt.  Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen.
-		<usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Wirklich beenden?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
@@ -2147,14 +2122,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
 			<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
-	<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
-		Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
+	<notification label="Beschäftigt-Modus-Warnung" name="BusyModePay">
+		Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
 
-Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen?
+Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
 		<form name="form">
-			<ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/>
-			<button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/>
-			<button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/>
+			<ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/>
+			<button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/>
+			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2289,8 +2264,11 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 	<notification name="GroupNotice">
 		Betreff: [SUBJECT], Nachricht: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist online
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist offline
 	</notification>
 	<notification name="AddSelfFriend">
 		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
@@ -2518,6 +2496,13 @@ Fliegen ist hier nicht möglich.
 	<notification name="DynamicPathfindingDisabled">
 		Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt. Um dieses Problem zu beheben, klicken Sie auf die Schaltfläche „Region neu formen“. Um weitere Informationen zu erhalten, klicken Sie auf „Hilfe“.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Hilfe" ignoretext="Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2780,7 +2765,7 @@ Ist das OK?
 	<notification name="ScriptQuestionCaution">
 		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
   
-Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
+Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
 			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
@@ -3361,633 +3346,4 @@ Versuch abgebrochen.
 		Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen?
 		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar eingefroren.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] hat Sie aufgetaut.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar aufgetaut.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Sie sind nicht mehr eingefroren und können sich frei bewegen.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Dieser Benutzer kann nicht eingefroren werden.
-	</notification>
-	<notification name="NowOwnObject">
-		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen.
-	</notification>
-	<notification name="SitFailCantMove">
-		Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Kommen Sie näher heran.  Sitzen auf Objekt nicht möglich, da
-es sich nicht in der gleichen Region befindet wie Sie.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Neues Objekt kann nicht erstellt werden. Die Region ist voll.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Ohne ausgewählte Hauptobjekte duplizieren.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Objekte können nicht dupliziert werden, da die Region voll ist.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Objekt kann nicht erstellt werden, da 
-die Parzelle voll ist.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Versuch zum Rezzen eines Objekts fehlgeschlagen.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Dieses Inventarobjekt ist auf der schwarzen Liste.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Sie können gegenwärtig keine Objekte erstellen.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Landsuche blockiert.
-Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt.
-Warten Sie kurz und versuchen Sie es noch einmal.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Sie sind gestorben und wurden nach Hause teleportiert
-	</notification>
-	<notification name="EjectComingSoon">
-		Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Sie können diese Region nicht betreten, da 
-der Server voll ist.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Erneutes Speichern im Inventar ist deaktiviert.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		„[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		„[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		„[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann.
-	</notification>
-	<notification name="NoModNoTaking">
-		Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben.
-	</notification>
-	<notification name="RezDestInternalError">
-		Interner Fehler: Unbekannter Zielttyp.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Löschen fehlgeschlagen, da Objekt nicht gefunden wurde
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Dieser Benutzer kann nicht hinausgeworfen werden.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
-	</notification>
-	<notification name="HomePositionSet">
-		Position für Zuhause festgelegt.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar hinausgeworfen.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Physik für Keyframe-Objekte kann nicht aktiviert werden.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden.
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt.
-	</notification>
-	<notification name="UnableAddItem">
-		Objekt konnte nicht hinzugefügt werden.
-	</notification>
-	<notification name="UnableEditItem">
-		Kein Bearbeiten möglich.
-	</notification>
-	<notification name="NoPermToEdit">
-		Bearbeiten nicht gestattet.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Kopieren dieses Inventars nicht gestattet.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden.
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
-	</notification>
-	<notification name="TooManyScripts">
-		Zu viele Skripts.
-	</notification>
-	<notification name="UnableAddScript">
-		Skript konnte nicht hinzugefügt werden.
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Asset-Server hat nicht rechtzeitig reagiert.  Objekt wurde zum Sim zurückübertragen.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		In dieser Region sind keine Physikformen aktiviert.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Sie können das Navmesh nicht regionsübergreifend modifizieren.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Hauptprim kann nicht auf formlos eingestellt werden.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		In dieser Region sind keine Physikmaterialien aktiviert.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Nur bei Hauptprims können die Physikmaterialien angepasst werden.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Sie können den Nahttyp eines Mesh-Objekts nicht ändern.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Sie können die Form eines Mesh-Objekts nicht ändern.
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Sie können diese Region nicht betreten, \nda die Region voll ist.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Verknüpfungsfehler – Eigentümer sind unterschiedlich
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Verknüpfungsfehler – zu viele Primitive
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Verknüpfungsfehler – nichts zum Verknüpfen vorhanden.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Verknüpfungsfehler – zu viele Pathfinding-Figuren
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Verknüpfungsfehler – nicht genügend Landressourcen
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert.
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Sie wurden von einem Anhang an [ITEM_ID] teleportiert
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Sie können hier nicht mehrere Objekte erstellen.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Objekt konnte nicht an angegebenem Ort platziert werden.  Versuchen Sie es erneut.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Auf diesem Land können keine Pflanzen erstellt werden.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle.
-	</notification>
-	<notification name="CantCreateObject">
-		Sie können gegenwärtig keine Objekte erstellen.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Ungültige Objektparameter
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle.
-	</notification>
-	<notification name="CantChangeShape">
-		Sie können diese Form nicht ändern.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Bäume und Gräser können nicht als Anhänge getragen werden.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Objekte im Gruppenbesitz können nicht angehängt werden.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Objekte, die Ihnen nicht gehören, können nicht angehängt werden.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Objekte, die zum Navmesh beitragen, können nicht angehängt werden.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Objekt kann nicht hier abgelegt werden.  Die Parzelle ist voll.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Grenzen Sie Ihre Löschparameter ein.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Asset kann nicht hochgeladen werden.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Keinen Benutzer zum Teleportieren nach Hause gefunden
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		Anforderdung nach übernatürlichen Kräften fehlgeschlagen
-	</notification>
-	<notification name="GenericRequestFailed">
-		generische Anforderdung fehlgeschlagen
-	</notification>
-	<notification name="CantUploadPostcard">
-		Postkarte kann nicht hochgeladen werden.  Versuchen Sie es später erneut.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Inventardetails für Gruppenmitteilung kann nicht abgerufen werden.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Inventar in Mitteilung kann nicht geparst werden.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Fehler beim Hochladen von Terrain.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Terraindatei geschrieben.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Terraindatei geschrieben, Download beginnt...
-	</notification>
-	<notification name="TerrainBaked">
-		Terrain geformt.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Sie sind nicht der autorisierte Käufer dieser Parzelle.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet.
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -&gt; „Fehler melden“...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Land wurde geteilt.
-	</notification>
-	<notification name="PassPurchased">
-		Sie haben einen Pass gekauft.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Region lässt keine Werbung zu.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Ihr Pass für dieses Land läuft demnächst ab.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben.
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Land in Gruppenbesitz kann nicht übertragen werden.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Passkauf momentan nicht möglich.  Versuchen Sie es später erneut.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Objekt kann nicht erstellt werden, \nda die Parzelle voll ist.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Landmarke für dieses Ereignis kann nicht erstellt werden.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Ihre übernatürlichen Kräfte heben das Einfrieren auf!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert.
-	</notification>
-	<notification name="ExpireExplanation">
-		Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung.
-	</notification>
-	<notification name="DieExplanation">
-		Das System kann Ihre Anfrage nicht verarbeiten.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Sie haben nicht genügend Geld, um Primitive zu erstellen.
-	</notification>
-	<notification name="RezObjectFailure">
-		Sie haben nicht genügend Geld, um Objekt zu erstellen.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Zuhause-Position neu festlegen, da Zuhause nicht zulässig war.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
-	</notification>
-	<notification name="SetHomePosition">
-		Position für Zuhause festgelegt.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Angefordertes Inventar kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Angeforderter Inventarordner kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateInventory">
-		Dieses Inventar kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Landmarke kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal.
-	</notification>
-	<notification name="InventoryNotForSale">
-		Inventar steht nicht zum Verkauf.
-	</notification>
-	<notification name="CantFindInvItem">
-		Inventarobjekt kann nicht gefunden werden.
-	</notification>
-	<notification name="CantFindObject">
-		Objekt kann nicht gefunden werden.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Nicht ersichtlich, wer bezahlt werden muss.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Sie können öffentlichen Objekten keine L$ geben.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Inventarerstellung für Inworld-Objekt fehlgeschlagen.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden.  Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden.  Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht.
-		<usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht.
-		<usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt.
-		<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
index 79a2ebe9df..dcfcffa6e2 100644
--- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/>
 	<icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/>
 	<icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/>
-	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index c105a5b8a3..2d140515d4 100644
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel" width="300">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtern" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/>
-		<menu_button name="view_btn" tool_tip="Sortieroptionen"/>
-		<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
-		<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
+	<text left_pad="5" name="title_text" width="260">
+		Liste der ignorierten Einwohner
+	</text>
+	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
+	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
+	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
+	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
deleted file mode 100644
index a9bfe4754e..0000000000
--- a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(laden)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
deleted file mode 100644
index afeaa14e81..0000000000
--- a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/>
-	<icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/>
-	<button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
index fc911a64df..d097a2b18c 100644
--- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Unbekannt"/>
-	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 8c05ca2c24..4e76147746 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -14,53 +14,81 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_filtered_friends_msg">
 		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche].
 	</string>
+	<string name="people_filter_label" value="Nach Leuten filtern"/>
+	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
 	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
+	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Nach Personen filtern" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/>
+				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
 			</panel>
 		</panel>
-		<panel label="FREUNDE" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Nach Personen filtern" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
-				<dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
-			</panel>
+		<panel label="MEINE FREUNDE" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPPEN" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/>
-				<menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
-				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
+		<panel label="MEINE GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Optionen"/>
+				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
 			</panel>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Nach Personen filtern" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
-				<dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Optionen"/>
+				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
 			</panel>
 		</panel>
-		<panel label="IGNORIERT" name="blocked_panel">
-			<panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 8193fd42c1..c9ae350147 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
-		<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
-		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Schriftgröße:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Klein" name="Small" value="0"/>
-			<item label="Mittel" name="Medium" value="1"/>
-			<item label="Groß" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Benachrichtigungen
-		</text>
-		<text name="friend_ims">
-			IMs von Freunden:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IMs von anderen:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			Konferenz-IMs:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Gruppen-Chat:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat in der Nähe:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Sound abspielen:
-		</text>
-		<check_box label="Neue Unterhaltung" name="new_conversation"/>
-		<check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
-		<check_box label="Teleport-Angebot" name="teleport_offer"/>
-		<check_box label="Inventarangebot" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Protokoll löschen..." name="clear_log"/>
-		<button label="Protokolle löschen..." name="delete_transcripts"/>
-		<button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Schriftgröße:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Klein" name="radio" value="0"/>
+		<radio_item label="Mittel" name="radio2" value="1"/>
+		<radio_item label="Groß" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
+	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+	<check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
+	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		IMs anzeigen in:
+	</text>
+	<text name="requires_restart_label">
+		(Neustart erforderlich)
+	</text>
+	<radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich).">
+		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
+		<radio_item label="Registerkarten" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Popups für eingehende Chats aktivieren:
+	</text>
+	<check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/>
+	<check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/>
+	<spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/>
+	<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
 	<button label="Übersetzen..." name="ok_btn"/>
 	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
 	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 4e453b6969..979ccba48d 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Nicht-stören-Antwort:
+		Antwort, wenn im „Beschäftigt“-Modus:
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 29239033fe..4c8d77d336 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
-			<combo_box.item label="Zoomen" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index e142cb8029..79cb73ecf9 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=de-DE&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
@@ -622,8 +622,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AvatarAway">
 		Abwesend
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Nicht stören
+	<string name="AvatarBusy">
+		Beschäftigt
 	</string>
 	<string name="AvatarMuted">
 		Ignoriert
@@ -859,12 +859,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat in der Nähe
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat in der Nähe)
-	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
@@ -928,15 +922,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
-	<string name="NotConnected">
-		Nicht verbunden
-	</string>
-	<string name="AgentNameSubst">
-		(Sie)
-	</string>
 	<string name="TeleportYourAgent">
 		Sie teleportieren
 	</string>
+	<string name="NotConnected">
+		Nicht verbunden
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1018,6 +1009,18 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="dictionary_files">
 		Wörterbücher
 	</string>
+	<string name="AvatarSetNotAway">
+		Nicht abwesend
+	</string>
+	<string name="AvatarSetAway">
+		Abwesend
+	</string>
+	<string name="AvatarSetNotBusy">
+		Nicht beschäftigt
+	</string>
+	<string name="AvatarSetBusy">
+		Beschäftigt
+	</string>
 	<string name="shape">
 		Form
 	</string>
@@ -1986,8 +1989,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen.
+	<string name="BusyModeResponseDefault">
+		Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden.  Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden.
 	</string>
 	<string name="MuteByName">
 		(Nach Namen)
@@ -2100,6 +2103,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Inhalte
+	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
 	</string>
@@ -3871,7 +3877,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Generelle Region
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden
+		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird.
@@ -3948,12 +3954,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="IM_unblock_only_groups_friends">
 		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
 	</string>
-	<string name="OnlineStatus">
-		Online
-	</string>
-	<string name="OfflineStatus">
-		Offline
-	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
@@ -3963,9 +3963,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="you_joined_call">
 		Sie sind dem Gespräch beigetreten
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war.
-	</string>
 	<string name="name_started_call">
 		[NAME] hat einen Voice-Anruf begonnen
 	</string>
@@ -3982,7 +3979,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Wird verbunden...
 	</string>
 	<string name="conference-title">
-		Chat mit mehreren Personen
+		Ad-hoc-Konferenz
 	</string>
 	<string name="conference-title-incoming">
 		Konferenz mit [AGENT_NAME]
@@ -4862,9 +4859,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Unterhaltungen
-	</string>
 	<string name="Command_Compass_Label">
 		Kompass
 	</string>
@@ -4940,9 +4934,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Tooltip">
 		Mit Leuten in der Nähe chatten
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Mit allen unterhalten
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Kompass
 	</string>
@@ -5072,13 +5063,4 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="UserDictionary">
 		[Benutzer]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 3b56e974d2..2152a9f6e9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -70,23 +70,26 @@
      top="0"
      left="0"
      right="-1"
-     bottom="-1">
+     bottom="-3">
         <layout_stack
          animate="false" 
          default_tab_group="2"
          follows="all"
          right="-5"
          bottom="-1"
+         top="0"
+         left="5"
+         border_size="0"
          layout="topleft"
          orientation="vertical"
          name="main_stack"
-         tab_group="1"
-         top="0"
-         left="5">
+         tab_group="1">
             <layout_panel
              auto_resize="false"
              name="toolbar_panel"
-             height="35">
+             height="35"
+             right="-1"
+             left="1">
                 <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
@@ -164,7 +167,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 right="-70"
+                 right="-67"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
@@ -196,7 +199,8 @@
             </layout_panel>
             <layout_panel
              name="body_panel"
-             height="235">
+             top="1"
+             bottom="-1">
                 <layout_stack
                  default_tab_group="2"
                  follows="all"
@@ -213,12 +217,14 @@
                      min_dim="0"
                      width="150" 
                      user_resize="true"
-                     auto_resize="false" />
+                     auto_resize="false" 
+                     bottom="-1" />
                     <layout_panel
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="221">
+                     min_width="221"
+                     bottom="-1">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
@@ -262,21 +268,28 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             height="35"
+             top_delta="0"
+             top="0"
+             height="26"
+             bottom="-1"
              auto_resize="false"
              name="chat_layout_panel">
                 <layout_stack
                  animate="false"
                  default_tab_group="2"
                  follows="all"
-                 right="-1"
                  orientation="horizontal"
                  name="input_panels"
                  top="0"
-                 bottom="-1"
-                 left="0">
+                 bottom="-2"
+                 left="0"
+                 right="-1">
                     <layout_panel
-                     name="input_editor_layout_panel">
+                     name="input_editor_layout_panel"
+                     auto_resize="true"
+                     user_resize="false"
+                     top="0"
+                     bottom="-1">
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -289,27 +302,32 @@
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         bottom="-8"
-                         left="5"
-                         right="-5"
+                         top="1"
+                         bottom="-2"
+                         left="4"
+                         right="-4"
                          wrap="true" />
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
+                     user_resize="false"
                      name="input_button_layout_panel"
-                     width="32">
+                     width="30"
+                     top="0"
+                     bottom="-1">
                         <button
+                         layout="topleft"
                          left="1"
-                         top="4"
+                         right="-1"
+                         top="1"
+                         height="22"
                          follows="left|right|top"
-                         height="25"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_overlay="Conv_expand_one_line"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
                          name="minz_btn"
-                         tool_tip="Shows/hides message panel"
-                         width="28" />
+                         tool_tip="Shows/hides message panel" />
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
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 b46b62ec4d..46ba4bd29d 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
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 b8128da358..28e032ce5f 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -123,6 +123,14 @@ name="Edit Outfit">
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
   <menu_item_separator
   layout="topleft" />
   <menu_item_call
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 276b5f106f..e7c2b80da2 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
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 d9bdfece38..c1ff026a74 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,12 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 101e104eab..52c4fb1613 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -180,7 +180,8 @@
        name="Set Logging Level"
        tear_off="true">
         <menu_item_check
-          label="Debug">
+         name="Debug"
+         label="Debug">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="0" />
@@ -189,7 +190,8 @@
            parameter="0" />
         </menu_item_check>
         <menu_item_check
-          label="Info">
+         name="Info"
+         label="Info">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="1" />
@@ -198,7 +200,8 @@
            parameter="1" />
         </menu_item_check>
         <menu_item_check
-          label="Warning">
+         name="Warning"
+         label="Warning">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="2" />
@@ -207,7 +210,8 @@
            parameter="2" />
         </menu_item_check>
         <menu_item_check
-          label="Error">
+         name="Error"
+         label="Error">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="3" />
@@ -216,7 +220,8 @@
            parameter="3" />
         </menu_item_check>
         <menu_item_check
-          label="None">
+         name="None"
+         label="None">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="4" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 544f06ac0c..a11cd13fdb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -131,6 +131,7 @@
        name="Status"
        tear_off="true">
         <menu_item_check
+         name="Away"
          label="Away">
           <menu_item_check.on_check
            function="View.Status.CheckAway" />
@@ -138,6 +139,7 @@
            function="World.SetAway" />
         </menu_item_check>
         <menu_item_check
+         name="Do Not Disturb"
          label="Do Not Disturb">
           <menu_item_check.on_check
            function="View.Status.CheckDoNotDisturb" />
@@ -257,6 +259,7 @@
              parameter="speak" />
         </menu_item_check>
         <menu_item_check
+         name="Conversation Log..."
          label="Conversation Log...">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -352,6 +355,7 @@
         </menu_item_call>
       <menu_item_separator/>
       <menu_item_check
+       name="Do Not Disturb"
        label="Do Not Disturb">
         <menu_item_check.on_check
          function="View.Status.CheckDoNotDisturb" />
@@ -3051,13 +3055,6 @@
                 <menu_item_call.on_click
                  function="Advanced.PrintAgentInfo" />
             </menu_item_call>
-            <menu_item_call
-             label="Memory Stats"
-             name="Memory Stats"
-             shortcut="control|alt|shift|M">
-                <menu_item_call.on_click
-                 function="Advanced.PrintTextureMemoryStats" />
-            </menu_item_call>
             <menu_item_check
              label="Region Debug Console"
              name="Region Debug Console"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5aa743b32d..7c08aef65e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2987,6 +2987,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
deleted file mode 100644
index 9202fab92d..0000000000
--- a/indra/newview/skins/default/xui/es/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtrar la gente" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
deleted file mode 100644
index f579e720fb..0000000000
--- a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSACIÓN:">
-	<floater.string name="Title">
-		CONVERSACIÓN: [NAME]
-	</floater.string>
-	<text name="page_label" value="Página"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
index f772441141..1cd752e6ec 100644
--- a/indra/newview/skins/default/xui/es/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSACIONES">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
-					<button name="add_btn" tool_tip="Iniciar una conversación nueva"/>
-					<button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Cerrar este panel"/>
-					<text name="stub_textbox">
-						Esta conversación está en una ventana aparte.   [secondlife:/// Traerla de vuelta.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSACIONES"/>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 5f38fbd615..3d9d17fc81 100644
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/>
-	<floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/>
-	<floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/>
-	<floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/>
-	<floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/>
-	<floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/>
-				<menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<button name="add_btn" tool_tip="Añadir alguien a esta conversación"/>
-				<button name="voice_call_btn" tool_tip="Abrir conexión de voz"/>
-				<button name="close_btn" tool_tip="Finalizar esta conversación"/>
-				<button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="A" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="A" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index acbb25b713..b5b756abb6 100644
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anónimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		te está llamando.
+		está llamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha entrado en un chat de voz en multiconferencia.
@@ -25,9 +25,9 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz?
 	</floater.string>
 	<text name="question">
-		Si respondes, te desconectarás de la conversación de voz actual.
+		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
 	</text>
-	<button label="Responder" label_selected="Responder" name="Accept"/>
-	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
-	<button label="Abrir MI en su lugar" name="Start IM"/>
+	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
+	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
+	<button label="Comenzar un MI" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index 3602270e5a..e93ecc9e10 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostrar:
 			</text>
-			<check_box label="Prueba" name="show_world"/>
+			<check_box label="Mundo virtual" name="show_world"/>
 			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 01b024bc3e..93bc9f293c 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Vista previa inmediata" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vista previa inhabilitada"/>
 	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
deleted file mode 100644
index 1115d67239..0000000000
--- a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ">
-	<slider label="Chat de voz" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 02ebe80ff7..1a265845af 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
+<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ">
 	<string name="no_voice_effect">
 		(Sin transformación de voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
deleted file mode 100644
index 0ebc511887..0000000000
--- a/indra/newview/skins/default/xui/es/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUMEN DE VOZ">
-	<slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
index a889992b8a..ff8ad0977a 100644
--- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
deleted file mode 100644
index e4e9a0bf63..0000000000
--- a/indra/newview/skins/default/xui/es/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
-	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
-	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
-	<menu_item_call label="Ver el perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
-	<menu_item_call label="Llamada de voz" name="voice_call"/>
-	<menu_item_call label="Historial del chat..." name="chat_history"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Quitar amigos" name="remove_friends"/>
-	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartir" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Ignorar la voz" name="block_unblock"/>
-	<menu_item_check label="Ignorar el texto" name="MuteText"/>
-	<menu_item_call label="Perfil del grupo" name="group_profile"/>
-	<menu_item_call label="Activar el grupo" name="activate_group"/>
-	<menu_item_call label="Abandonar el grupo" name="leave_group"/>
-	<context_menu label="Opciones del moderador" name="Moderator Options">
-		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
-		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/>
-		<menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
deleted file mode 100644
index 090e6fb0bf..0000000000
--- a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="MI..." name="IM"/>
-	<menu_item_call label="Llamada de voz..." name="Call"/>
-	<menu_item_call label="Abrir el historial de chat..." name="Chat history"/>
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Invitar al grupo..." name="Invite"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
deleted file mode 100644
index b8b4616b2d..0000000000
--- a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por fecha" name="sort_by_date"/>
-	<menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/>
-	<menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
deleted file mode 100644
index 5ba0fb898e..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
-	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
-	<menu_item_call label="Historial del chat..." name="chat_history"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
-	<menu_item_check label="Ignorar el texto" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
deleted file mode 100644
index 6ea970b826..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Vista compacta" name="compact_view"/>
-	<menu_item_check label="Vista ampliada" name="expanded_view"/>
-	<menu_item_check label="Mostrar tiempo" name="IMShowTime"/>
-	<menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index a99c889bb0..7e4578b950 100644
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
 	<menu_item_call label="Ignorar..." name="Block"/>
-	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
-	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 56e64c729f..558ff6afd3 100644
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
 		<menu_item_call label="Ojos nuevos" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Abrir todas las carpetas" name="expand"/>
-	<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
 	<menu_item_call label="Renombrar el vestuario" name="rename"/>
 	<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml
deleted file mode 100644
index fcfeeb922b..0000000000
--- a/indra/newview/skins/default/xui/es/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/>
-	<menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/>
-	<menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/>
-	<menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/>
-	<menu_item_call label="Preferencias de chat..." name="chat_preferences"/>
-	<menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/>
-	<menu_item_check label="Registro de conversaciones..." name="Conversation"/>
-	<menu_item_check label="Traducir el chat" name="Translate_chat"/>
-	<menu_item_check label="Configuración de traducción..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
deleted file mode 100644
index 986389a4fe..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="No ignorar" name="unblock"/>
-	<menu_item_call label="Perfil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
deleted file mode 100644
index 10f6a3fc14..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/>
-	<menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
deleted file mode 100644
index bc557c7ec1..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
deleted file mode 100644
index ad896c1b74..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
-	<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 125e25cd1a..51bd2c7208 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamada de voz" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
deleted file mode 100644
index c3973625b0..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index 09bb119d5a..dc1486d879 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver el perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
-	<menu_item_call label="Llamada de voz" name="voice_call"/>
-	<menu_item_call label="Ver el historial de chat..." name="chat_history"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartir" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
+	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index 9df160f5ad..227c5ebe58 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Añadir como amigos" name="add_friends"/>
-	<menu_item_call label="Quitar amigos" name="remove_friends"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Visita" name="call"/>
-	<menu_item_call label="Compartir" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
+	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
deleted file mode 100644
index c2fb360dd1..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver mapa" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
deleted file mode 100644
index f0ffd14024..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por más reciente" name="sort_most"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index 69a03671ab..a089c8f68e 100644
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Ver el perfil" name="show_agent"/>
-	<menu_item_call label="Enviar un MI..." name="send_im"/>
-	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
+	<menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index e78fdec558..8791a290af 100644
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Perfil del objeto..." name="show_object"/>
+	<menu_item_call label="Mostrar la información del objeto" name="show_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 30842f53f2..d80150ef6d 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Estado" name="Status"/>
+		<menu label="Estado" name="Status">
+			<menu_item_call label="Ausente" name="Set Away"/>
+			<menu_item_call label="Ocupado" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -28,18 +31,14 @@
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
-		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
-		<menu label="Transformación de voz" name="VoiceMorphing">
-			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
-			<menu_item_check label="Probar..." name="Preview"/>
-			<menu_item_call label="Suscribir..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Configuración de voz..." name="Nearby Voice"/>
+		<menu_item_check label="Transformación de voz..." name="ShowVoice"/>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_check label="Amigos" name="My Friends"/>
-		<menu_item_check label="Grupos" name="My Groups"/>
-		<menu_item_check label="Gente cerca" name="Active Speakers"/>
+		<menu_item_call label="Amigos" name="My Friends"/>
+		<menu_item_call label="Grupos" name="My Groups"/>
+		<menu_item_call label="Gente cerca" name="Active Speakers"/>
 		<menu_item_call label="Lista de ignorados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -115,6 +114,7 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Tomar" name="Menu Object Take"/>
 			<menu_item_call label="Coger una copia" name="Take Copy"/>
+			<menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -129,7 +129,6 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opciones" name="Options">
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
@@ -159,13 +158,6 @@
 	<menu label="Ayuda" name="Help">
 		<menu_item_call label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Guía del usuario" name="User’s guide"/>
-		<menu_item_call label="Base de Conocimientos" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Foros comunitarios" name="Community Forums"/>
-		<menu_item_call label="Portal de soporte" name="Support portal"/>
-		<menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar una infracción" name="Report Abuse"/>
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
@@ -343,14 +335,9 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Velocidad de animación" name="Animation Speed">
-				<menu_item_call label="Acelerar todas las animaciones un 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="Ralentizar todas las animaciones un 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="Restablecer la velocidad de todas las animaciones" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animaciones a cámara lenta" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Animation Info" name="Animation Info"/>
+			<menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/>
 			<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="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 05455f54c3..7dfb27717d 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -511,24 +511,6 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
-
-    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Probablemente ya existe un controlador más reciente para tu procesador de gráficos.  La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
-
-    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=es
-		</url>
-		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -1571,13 +1553,10 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 		En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones.
-
-- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias &gt; General).
-- Se rehusarán los ofrecimientos de teleporte.
-- Se rechazarán las llamadas de voz.
-		<usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Pasar al modo ocupado.
+Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera.
+		<usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta.
@@ -2064,10 +2043,6 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta?
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación.
-		<usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
@@ -2141,14 +2116,14 @@ Linden Lab
 			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
-	<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
-		Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
+	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
+		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
 
-¿Deseas desactivar No molestar antes de finalizar esta transacción?
+¿Quieres salir del modo Ocupado antes de completar esta transacción?
 		<form name="form">
-			<ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/>
-			<button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/>
-			<button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/>
+			<ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/>
+			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
+			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2283,8 +2258,11 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 	<notification name="GroupNotice">
 		Asunto: [SUBJECT], Mensaje: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está conectado
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está desconectado
 	</notification>
 	<notification name="AddSelfFriend">
 		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
@@ -2512,6 +2490,13 @@ Aquí no puedes volar.
 	<notification name="DynamicPathfindingDisabled">
 		Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto. Para que los objetos móviles se comporten correctamente, pulsa el botón “Recargar la región”. Si quieres más información, elige “Ayuda”.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Ayuda" ignoretext="Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2772,9 +2757,9 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
   
-No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
+Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
 		<form name="form">
 			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
@@ -3346,633 +3331,4 @@ Intento cancelado.
 		Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
 		<usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar congelado.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] te ha descongelado.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar descongelado.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Error al congelar: no tienes permisos de administrador en esa parcela.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		La congelación ha terminado, puedes seguir con tus asuntos.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Lo sentimos, ese usuario no se puede congelar.
-	</notification>
-	<notification name="NowOwnObject">
-		Ahora eres el propietario del objeto [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		El objeto no se puede colocar porque hay demasiadas solicitudes.
-	</notification>
-	<notification name="SitFailCantMove">
-		No te puedes sentar porque en este momento no puedes desplazarte.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		No te puedes sentar porque no tienes permiso para estar en ese terreno.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Acércate. No te puedes sentar en el objeto porque
-no está en la misma región que tú.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		No se puede crear el nuevo objeto. La región está llena.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		No puedes crear árboles y hierba en un terreno que no es tuyo.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Error al copiar: careces de permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Error al copiar: no se te puede transferir el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Error al copiar porque el objeto &apos;[OBJ_NAME]&apos; contribuye al navmesh.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Duplicación sin objetos raíz seleccionados.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		No se pueden duplicar objetos porque la región está llena.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		No se puede crear el objeto porque 
-la parcela está llena.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Error al intentar colocar un objeto.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		No se puede crear un objeto que ha causado problemas en esta región.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Ese objeto de inventario está en la lista negra.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Actualmente no tienes autorización para crear objetos.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Búsqueda de terrenos bloqueada.
-Has realizado demasiadas búsquedas de terreno con excesiva rapidez.
-Prueba otra vez dentro de un minuto.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		No hay suficientes recursos de script disponibles para anexar el objeto
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Has muerto y te has teleportado a tu lugar de origen
-	</notification>
-	<notification name="EjectComingSoon">
-		Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir.
-	</notification>
-	<notification name="NoEnterServerFull">
-		No puedes entrar en esta región porque 
-el servidor está lleno.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Se ha deshabilitado Devolver el objeto a mi inventario.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque no tienes permiso para modificar el objeto &apos;[DEST_NAME]&apos;.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		No se puede guardar &apos;[OBJ_NAME]&apos; de nuevo en el inventario; esta operación está desactivada.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		No se puede copiar tu selección porque no tienes permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
-	</notification>
-	<notification name="NoTransNoCopy">
-		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		El sistema de permisos no admite la eliminación del objeto &apos;[OBJ_NAME]&apos; del simulador.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		No se puede guardar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		No se puede guardar tu selección porque el objeto &apos;[OBJ_NAME]&apos; no se puede copiar.
-	</notification>
-	<notification name="NoModNoTaking">
-		No se puede aceptar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="RezDestInternalError">
-		Error interno: tipo de destino desconocido.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Error al borrar: el objeto no se encuentra
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Lo sentimos, ese usuario no se puede expulsar.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Esta región no te permite configurar aquí tu lugar de origen.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
-	</notification>
-	<notification name="HomePositionSet">
-		Posición de origen ajustada.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar expulsado.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Error al expulsar: no tienes permiso de administrador en esa parcela.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		No tienes permiso para modificar ese objeto
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		No se puede habilitar la física para un objeto que contribuye al navmesh.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		No se puede activar la física para los objetos con fotogramas clave.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		No se puede habilitar la física para el objeto: recursos de terreno insuficientes.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh.
-	</notification>
-	<notification name="UnableAddItem">
-		¡No se puede añadir un objeto!
-	</notification>
-	<notification name="UnableEditItem">
-		¡No se puede editar esto!
-	</notification>
-	<notification name="NoPermToEdit">
-		No puedes editar esto.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		No está permitido copiar ese inventario.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		No se puede guardar en el contenido del objeto: el objeto ya no existe.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo.
-	</notification>
-	<notification name="TooManyScripts">
-		Demasiados scripts.
-	</notification>
-	<notification name="UnableAddScript">
-		¡No se puede añadir un script!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Esta región no tiene habilitadas las formas de física.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		No se puede modificar el navmesh a través de límites de región.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		No se pueden establecer propiedades de física en ese tipo de objeto.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		No se puede establecer que un prim raíz no tenga forma.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Esta región no tiene habilitados los materiales de física.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Solo se pueden ajustar los materiales de física de las prims raíces.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Aun no es posible configurar materiales de física para los personajes.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Una o varias de las propiedades de los materiales de física especificados no son válidas.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		No se puede cambiar el tipo de unión de un objeto de la malla.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		No se puede cambiar la forma de un objeto de la malla
-	</notification>
-	<notification name="FullRegionCantEnter">
-		No puedes entrar en esta región porque \nla región está llena.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Error de vínculo: los propietarios son diferentes
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Error de vínculo: no se puede modificar el navmesh a través de límites de región.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Error de vínculo: no tienes permiso de edición.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Error de vínculo: demasiadas primitivas
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Error de vínculo: no se pueden vincular &apos;no copiable&apos; y &apos;no transferible&apos;
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Error de vínculo: no hay objetos que se puedan vincular.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Error de vínculo: demasiados personajes de pathfinding
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Error de vínculo: recursos de terreno insuficientes
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Has sido teleportado al origen por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Has sido teleportado a tu origen por el objeto &apos;[OBJECT_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Has sido teleportado por un anexo de [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; cuyo propietario es un usuario desconocido.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		No se puede crear el objeto solicitado. La región está llena.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		No puedes anexar varios objetos a un solo lugar.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Aquí no se pueden crear varios objetos.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		No se puede crear el objeto solicitado. Vuelve a intentarlo.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Error al colocar: la carga del objeto solicitado ha tardado demasiado.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		No se pueden crear plantas en este terreno.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		No se puede restaurar el objeto. No se ha encontrado una posición del mundo.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		No se puede colocar el objeto porque sus datos de malla no son válidos.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		No se puede colocar el objeto porque la región ya contiene demasiados scripts.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Tus privilegios de acceso no te permiten crear objetos allí.
-	</notification>
-	<notification name="CantCreateObject">
-		Actualmente no tienes autorización para crear objetos.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Los parámetros de objeto no son válidos
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Tus privilegios de acceso no te permiten duplicar objetos aquí.
-	</notification>
-	<notification name="CantChangeShape">
-		No tienes permiso para cambiar esta forma.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Tus privilegios de acceso no te permiten reclamar objetos aquí.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Error de transferencia: no tienes permiso para transferir objetos para tu grupo.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Tus privilegios de acceso no te autorizan a comprar objetos aquí.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		No se puede anexar el objeto porque un avatar está sentado en él.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		No te puedes poner árboles y hierba como anexos.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		No se pueden anexar objetos que son propiedad de grupos.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		No puedes anexar objetos de los que no eres propietario.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		No se pueden anexar objetos que contribuyen al navmesh.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		No se puede anexar el objeto porque no tienes permiso para moverlo.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		No hay suficientes recursos de script disponibles para anexar el objeto
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Error al soltar el anexo: no tienes permiso para soltarlo allí.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Error al soltar el anexo: recurso de terreno disponible insuficiente.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Error al soltar los anexos: los recursos disponibles son insuficientes.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		No se puede soltar el objeto aquí. La parcela está llena.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Acota los parámetros de eliminación.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		No se puede subir el activo.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		No se ha podido encontrar el usuario para teleportarlo al origen
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		error en la solicitud de superpoderes
-	</notification>
-	<notification name="GenericRequestFailed">
-		error de solicitud genérico
-	</notification>
-	<notification name="CantUploadPostcard">
-		No se puede subir la postal. Vuelve a intentarlo más tarde.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		No se pueden obtener los datos de inventario del aviso de grupo.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		No se puede enviar el aviso de grupo: no está permitido.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		No se puede enviar el aviso del grupo: el inventario no se puede construir.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		No se puede analizar el inventario del aviso.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Error al subir terreno.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Se ha registrado el archivo de terreno.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Archivo de terreno registrado, iniciando la descarga...
-	</notification>
-	<notification name="TerrainBaked">
-		Terreno predeterminado.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Para comprar esta parcela debes actualizar el visor.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Error al comprar: esta parcela no está en venta.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		No se puede comprar: el precio de venta o la superficie del terreno han cambiado.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		No eres el comprador autorizado de esta parcela.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		No puedes comprar esta parcela porque ya está en espera de una autorización de compra
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		No se pueden construir objetos aquí porque se desbordaría la parcela.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		La selección no contiene suficientes parcelas alquiladas para unirlas.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -&gt; Notificar fallo...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		El terreno se ha dividido.
-	</notification>
-	<notification name="PassPurchased">
-		Has comprado un pase.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		La región no permite anuncios.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Tu pase para este terreno está a punto de caducar.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Esta superficie no es adecuada para sentarse, prueba en otro sitio.
-	</notification>
-	<notification name="CantSitNoRoom">
-		No hay sitio para sentarse aquí, prueba en otro lugar.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Error al reclamar el objeto: no tienes permiso
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Error al reclamar el objeto: no tienes suficientes L$.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		No se puede transferir un terreno propiedad de un grupo.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Error al comprar el objeto, no tienes suficientes L$.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Error al comprar el inventario: no tienes suficientes L$.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		No tienes suficientes L$ para comprar un pase a este terreno.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		No se puede crear el objeto porque \nla parcela está llena.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		No se puede crear un hito para el evento.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		¡Tus superpoderes anulan la congelación!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Error en la solicitud de poderes especiales. Esta solicitud se ha registrado.
-	</notification>
-	<notification name="ExpireExplanation">
-		El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud.
-	</notification>
-	<notification name="DieExplanation">
-		El sistema no puede procesar tu solicitud.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Dinero insuficiente para crear la primitiva.
-	</notification>
-	<notification name="RezObjectFailure">
-		Dinero insuficiente para crear el objeto.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Se ha restaurado la posición de origen, puesto que dicha posición no era válida.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Esta región no te permite configurar aquí tu lugar de origen.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
-	</notification>
-	<notification name="SetHomePosition">
-		Posición de origen ajustada.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		No se puede quitar el objeto por un error del inventario.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		No se puede crear el inventario solicitado.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		No se puede crear la carpeta de inventario solicitada.
-	</notification>
-	<notification name="CantCreateInventory">
-		No se puede crear el inventario.
-	</notification>
-	<notification name="CantCreateLandmark">
-		No se puede crear un hito.
-	</notification>
-	<notification name="CantCreateOutfit">
-		No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto.
-	</notification>
-	<notification name="InventoryNotForSale">
-		El inventario no está en venta.
-	</notification>
-	<notification name="CantFindInvItem">
-		No se encuentra el objeto del inventario.
-	</notification>
-	<notification name="CantFindObject">
-		No se puede encontrar el objeto.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		En esta región actualmente no están activadas las transferencias de dinero a los objetos.
-	</notification>
-	<notification name="CantPayNoAgent">
-		No se ha averiguado a quién se debe pagar.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		No se pueden dar L$ a los objetos públicos.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Error al crear un inventario de objeto del mundo virtual.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo.
-		<usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup.
-		<usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		No se pueden mover los archivos. Ruta anterior restaurada.
-		<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
index c73e34b299..5220df5d21 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
@@ -26,6 +26,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/>
-	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index a3de14ae67..cddbad1195 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtro" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/>
-		<menu_button name="view_btn" tool_tip="Opciones de clasificación"/>
-		<menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/>
-		<button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
+	<text name="title_text">
+		Lista de ignorados
+	</text>
+	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
+	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
+	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
+	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
deleted file mode 100644
index cc4a7e951d..0000000000
--- a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(cargando)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
deleted file mode 100644
index 2fc8cd3aff..0000000000
--- a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="La conversación incluía voz"/>
-	<icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/>
-	<button name="delete_btn" tool_tip="Quitar esta entrada"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
index 4d682068d7..5c9f1c3688 100644
--- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconocido"/>
-	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 7a7dfca0b8..a9d38dca25 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar].
 	</string>
+	<string name="people_filter_label" value="Filtrar a la gente"/>
+	<string name="groups_filter_label" value="Filtrar a los grupos"/>
 	<string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/>
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
+	<filter_editor label="Filtrar" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtrar la gente" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/>
-				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/>
+				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
 			</panel>
 		</panel>
-		<panel label="AMIGOS" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtrar la gente" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/>
-				<button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/>
-				<dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
-			</panel>
+		<panel label="MIS AMIGOS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtrar los grupos" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/>
-				<menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/>
-				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
-				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
+		<panel label="MIS GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Opciones"/>
+				<button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
+				<button name="activate_btn" tool_tip="Activar el grupo seleccionado"/>
 			</panel>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtrar la gente" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/>
-				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
-				<dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Opciones"/>
+				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
 			</panel>
 		</panel>
-		<panel label="BLOQUEADO" name="blocked_panel">
-			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 28bc98f988..b0b6114e88 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
-		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
-		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Tamaño de la fuente:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Pequeña" name="Small" value="0"/>
-			<item label="Mediana" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notificaciones
-		</text>
-		<text name="friend_ims">
-			MI de amigos:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			MI de no amigos:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="conference_ims">
-			MI de conferencia:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="group_chat">
-			Chat de grupo:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Para suspender provisionalmente todas las notificaciones, usa Comunicarme &gt; No molestar.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Reproducir sonido:
-		</text>
-		<check_box label="Nueva conversación" name="new_conversation"/>
-		<check_box label="Llamada de voz entrante" name="incoming_voice_call"/>
-		<check_box label="Oferta de teleporte" name="teleport_offer"/>
-		<check_box label="Oferta de inventario" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Limpiar el registro..." name="clear_log"/>
-		<button label="Eliminar transcripciones..." name="delete_transcripts"/>
-		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Tamaño de la fuente:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Disminuir" name="radio" value="0"/>
+		<radio_item label="Medio" name="radio2" value="1"/>
+		<radio_item label="Aumentar" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+	<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
+	<check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/>
+	<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Mostrar los MI en:
+	</text>
+	<text name="requires_restart_label">
+		(requiere reiniciar)
+	</text>
+	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
+		<radio_item label="Ventanas distintas" name="radio" value="0"/>
+		<radio_item label="Pestañas" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Permitir ventanas de chat emergentes:
+	</text>
+	<check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/>
+	<check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/>
+	<spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/>
+	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
 	<button label="Traducción…" name="ok_btn"/>
 	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
 	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 98b0081da9..4fc163f5b6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -69,9 +69,6 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta de No molestar:
+		Respuesta cuando estoy en modo ocupado:
 	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index cb061796e7..9da2958953 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar el objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
-			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 937433e210..52bcab54e5 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
@@ -610,8 +610,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AvatarAway">
 		Ausente
 	</string>
-	<string name="AvatarDoNotDisturb">
-		No molestar
+	<string name="AvatarBusy">
+		Ocupado
 	</string>
 	<string name="AvatarMuted">
 		Ignorado
@@ -844,12 +844,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ST_NO_JOINT">
 		No se puede encontrar ROOT o JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat)
-	</string>
 	<string name="whisper">
 		susurra:
 	</string>
@@ -913,9 +907,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
-	<string name="AgentNameSubst">
-		(Tú)
-	</string>
 	<string name="TeleportYourAgent">
 		Teleportarte
 	</string>
@@ -1000,6 +991,18 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="dictionary_files">
 		Diccionarios
 	</string>
+	<string name="AvatarSetNotAway">
+		Salir del estado ausente
+	</string>
+	<string name="AvatarSetAway">
+		Pasar al estado ausente
+	</string>
+	<string name="AvatarSetNotBusy">
+		Salir del estado ocupado
+	</string>
+	<string name="AvatarSetBusy">
+		Pasar al estado ocupado
+	</string>
 	<string name="shape">
 		Forma
 	</string>
@@ -1956,8 +1959,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="PanelContentsNewScript">
 		Script nuevo
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Este residente tiene activado &apos;No molestar&apos; y verá tu mensaje más tarde.
+	<string name="BusyModeResponseDefault">
+		El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
 	</string>
 	<string name="MuteByName">
 		(Por el nombre)
@@ -2070,6 +2073,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Contenidos
+	</string>
 	<string name="AcquiredItems">
 		Artículos adquiridos
 	</string>
@@ -3787,7 +3793,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Región General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella
+		Los avatares están visibles y está permitido el chat fuera de esta parcela
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue.
@@ -3861,12 +3867,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Saved_message">
 		(Guardado [LONG_TIMESTAMP])
 	</string>
-	<string name="OnlineStatus">
-		Conectado/a
-	</string>
-	<string name="OfflineStatus">
-		Desconectado/a
-	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
@@ -3876,9 +3876,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Has entrado en la llamada de voz
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Rechazaste la llamada de voz automáticamente porque estaba activado &apos;No molestar&apos;.
-	</string>
 	<string name="name_started_call">
 		[NAME] inició una llamada de voz
 	</string>
@@ -3891,9 +3888,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Se colgó la llamada de voz
 	</string>
-	<string name="conference-title">
-		Chat multi-persona
-	</string>
 	<string name="conference-title-incoming">
 		Conferencia con [AGENT_NAME]
 	</string>
@@ -4772,9 +4766,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversaciones
-	</string>
 	<string name="Command_Compass_Label">
 		Brújula
 	</string>
@@ -4850,9 +4841,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Tooltip">
 		Habla por chat de texto con las personas próximas
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Conversar con todos
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Brújula
 	</string>
@@ -4982,13 +4970,4 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="UserDictionary">
 		[Usuario]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
deleted file mode 100644
index e9017c79b1..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
deleted file mode 100644
index 9a486a84c6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSATION:">
-	<floater.string name="Title">
-		CONVERSATION: [NAME]
-	</floater.string>
-	<text name="page_label" value="Page"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
index f0b17e8437..5ea073365e 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
-					<button name="add_btn" tool_tip="Commencer une nouvelle conversation"/>
-					<button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/>
-					<text name="stub_textbox">
-						Cette conversation s&apos;affiche dans une fenêtre distincte.   [secondlife:/// la rattacher.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 8ab98b8e4e..516eb41362 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] a été invité à la conversation."/>
-	<floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/>
-	<floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/>
-	<floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/>
-	<floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/>
-	<floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/>
-				<button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/>
-				<button name="close_btn" tool_tip="Mettre fin à cette conversation"/>
-				<button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="À" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="À" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
index 9e6946ba9e..7594eec5f2 100644
--- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonyme
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		vous appelle.
+		appelle.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		a rejoint un chat vocal avec conférence.
@@ -25,9 +25,9 @@
 		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</floater.string>
 	<text name="question">
-		Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle.
+		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</text>
-	<button label="Répondre" label_selected="Répondre" name="Accept"/>
-	<button label="Ignorer" label_selected="Ignorer" name="Reject"/>
-	<button label="Ouvrir IM à la place" name="Start IM"/>
+	<button label="Accepter" label_selected="Accepter" name="Accept"/>
+	<button label="Refuser" label_selected="Refuser" name="Reject"/>
+	<button label="Lancer IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 0bcf55aba5..02d969dc08 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Afficher :
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Monde" name="show_world"/>
 			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
 			<check_box label="Maillage de navigation" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index eace67026c..f86c1a4217 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
deleted file mode 100644
index f4f452eea7..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL">
-	<slider label="Chat vocal" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index f9a76d127e..671fb5c14d 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
+<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX">
 	<string name="no_voice_effect">
 		(Aucun effet de voix)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
deleted file mode 100644
index bf91a5bb79..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUME DE LA VOIX">
-	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
index fea0486d8a..8276d57025 100644
--- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/>
-	<menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
deleted file mode 100644
index 857ead603b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
-	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
-	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
-	<menu_item_call label="Voir le profil" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
-	<menu_item_call label="Appel" name="voice_call"/>
-	<menu_item_call label="Historique du chat..." name="chat_history"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Supprimer ces amis" name="remove_friends"/>
-	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Carte" name="map"/>
-	<menu_item_call label="Partager" name="share"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_check label="Bloquer le chat vocal" name="block_unblock"/>
-	<menu_item_check label="Ignorer le texte" name="MuteText"/>
-	<menu_item_call label="Profil du groupe" name="group_profile"/>
-	<menu_item_call label="Activer le groupe" name="activate_group"/>
-	<menu_item_call label="Quitter le groupe" name="leave_group"/>
-	<context_menu label="Options du modérateur" name="Moderator Options">
-		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
-		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/>
-		<menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
deleted file mode 100644
index 4e7e84199d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Appel..." name="Call"/>
-	<menu_item_call label="Ouvrir l&apos;historique du chat..." name="Chat history"/>
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Téléporter" name="teleport"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Inviter dans le groupe..." name="Invite"/>
-	<menu_item_call label="Carte" name="Map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
deleted file mode 100644
index c515a8e8e5..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Trier par nom" name="sort_by_name"/>
-	<menu_item_check label="Trier par date" name="sort_by_date"/>
-	<menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/>
-	<menu_item_call label="Afficher l&apos;historique du Chat près de moi" name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
deleted file mode 100644
index 1ec5910c8f..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Devenir amis" name="Add Friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
-	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
-	<menu_item_call label="Historique du chat..." name="chat_history"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Carte" name="map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/>
-	<menu_item_check label="Ignorer le texte" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
deleted file mode 100644
index 03a091d1cc..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Vue compacte" name="compact_view"/>
-	<menu_item_check label="Vue développée" name="expanded_view"/>
-	<menu_item_check label="Afficher l’heure" name="IMShowTime"/>
-	<menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 7c94930160..69f8e88a0d 100644
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
 	<menu_item_call label="Ignorer..." name="Block"/>
-	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
-	<menu_item_call label="Me téléporter à l’emplacement de l&apos;objet" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index 21b19eded6..b5181f4f82 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Développer tous les dossiers" name="expand"/>
-	<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
deleted file mode 100644
index 1811082c84..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/>
-	<menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/>
-	<menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/>
-	<menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/>
-	<menu_item_call label="Préférences pour le chat..." name="chat_preferences"/>
-	<menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/>
-	<menu_item_check label="Journal des conversations..." name="Conversation"/>
-	<menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/>
-	<menu_item_check label="Paramètres de traduction" name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
deleted file mode 100644
index 47589572c2..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Ne plus ignorer" name="unblock"/>
-	<menu_item_call label="Profil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
deleted file mode 100644
index 79880dd16d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
-	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
deleted file mode 100644
index 13f1575090..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Trier par nom" name="sort_by_name"/>
-	<menu_item_check label="Trier par type" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
deleted file mode 100644
index cc81172462..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Trier par statut" name="sort_status"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
-	<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
index 8e32f065fa..eb51b4cf7e 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Afficher les infos" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Appel" name="Call"/>
+	<menu_item_call label="Appeler" name="Call"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Quitter" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
deleted file mode 100644
index 79ede5e22d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 6f7d02ef74..26bd3978a9 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Voir le profil" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Téléporter" name="offer_teleport"/>
-	<menu_item_call label="Appel" name="voice_call"/>
-	<menu_item_call label="Afficher l&apos;historique du chat..." name="chat_history"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Carte" name="map"/>
-	<menu_item_call label="Partager" name="share"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Carte" name="Map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
+	<menu_item_call label="Proposer une téléportation" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
index 37abf831c2..8400ec0a14 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Devenir amis" name="add_friends"/>
-	<menu_item_call label="Supprimer des amis" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Appeler" name="call"/>
-	<menu_item_call label="Partager" name="share"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_call label="Téléporter" name="offer_teleport"/>
+	<menu_item_call label="Devenir amis" name="Add Friends"/>
+	<menu_item_call label="Supprimer des amis" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_call label="Proposer une téléportation" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
deleted file mode 100644
index 086002dce5..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Trier par distance" name="sort_distance"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_check label="Afficher la carte" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
deleted file mode 100644
index a7d698ab7c..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index d701b3a414..5ed627fbc3 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil" name="show_agent"/>
-	<menu_item_call label="Envoyer IM..." name="send_im"/>
-	<menu_item_call label="Devenir amis..." name="add_friend"/>
+	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index 0a934d3e69..f581c3ef9d 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
+	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 457b756c7d..85020afe25 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Statut" name="Status"/>
+		<menu label="Statut" name="Status">
+			<menu_item_call label="Absent" name="Set Away"/>
+			<menu_item_call label="Occupé" name="Set Busy"/>
+		</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="Page d&apos;accueil du compte..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
-		<menu_item_check label="Conversations..." name="Conversations"/>
-		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
+		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
-		<menu label="Effet de voix" name="VoiceMorphing">
-			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
-			<menu_item_check label="Aperçu..." name="Preview"/>
-			<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/>
+		<menu_item_check label="Effet de voix..." name="ShowVoice"/>
 		<menu_item_check label="Gestes..." name="Gestures"/>
-		<menu_item_check label="Amis" name="My Friends"/>
-		<menu_item_check label="Groupes" name="My Groups"/>
-		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_call label="Amis" name="My Friends"/>
+		<menu_item_call label="Groupes" name="My Groups"/>
+		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
 		<menu_item_call label="Liste des ignorés" name="Block List"/>
 	</menu>
 	<menu label="Monde" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Acheter" name="Menu Object Buy"/>
 			<menu_item_call label="Prendre" name="Menu Object Take"/>
 			<menu_item_call label="Prendre une copie" name="Take Copy"/>
+			<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Renvoi de l&apos;objet" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Options" name="Options">
 			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Aide rapide..." name="How To"/>
 		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Guide de l&apos;utilisateur" name="User’s guide"/>
-		<menu_item_call label="Base de connaissances" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Forums de la communauté" name="Community Forums"/>
-		<menu_item_call label="Portail d&apos;assistance" name="Support portal"/>
-		<menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
@@ -393,14 +385,9 @@
 				<menu_item_call label="Test femme" name="Test Female"/>
 				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Vitesse d&apos;animation" name="Animation Speed">
-				<menu_item_call label="Toutes les animations 10 % plus rapides" name="All Animations 10 Faster"/>
-				<menu_item_call label="Toutes les animations 10 % plus lentes" name="All Animations 10 Slower"/>
-				<menu_item_call label="Réinitialiser la vitesse de toutes les animations" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
 			<menu_item_check label="Infos sur l&apos;animation" name="Animation Info"/>
+			<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
 			<menu_item_check label="Afficher la direction du regard" name="Show Look At"/>
 			<menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/>
 			<menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index e73cc6e6e0..30154d1873 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -515,24 +515,6 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
-
-    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
-
-    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=fr
-		</url>
-		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -1561,13 +1543,10 @@ Quitter le groupe ?
 		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Ne pas déranger est activé.  Vous ne recevrez pas les notifications de communications entrantes.
-
-- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences &gt; Général).
-- Toutes les offres de téléportation seront refusées.
-- Les appels vocaux seront refusés.
-		<usetemplate ignoretext="J&apos;ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Le mode Occupé est sélectionné.
+Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
+		<usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
@@ -2054,10 +2033,6 @@ Déplacer les objets de l&apos;inventaire ?
 		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée.  Tous les participants recevront les notifications de nouvelle conversation.
-		<usetemplate ignoretext="Confirmer l&apos;ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Êtes-vous certain de vouloir quitter ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2132,14 +2107,14 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
 	</notification>
-	<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
-		Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
+	<notification label="Réponse si occupé(e)" name="BusyModePay">
+		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
 
-Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
+Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
 		<form name="form">
-			<ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/>
-			<button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/>
+			<ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/>
+			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2274,8 +2249,11 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 	<notification name="GroupNotice">
 		Sujet : [SUBJECT], Message : [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est en ligne
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est hors ligne
 	</notification>
 	<notification name="AddSelfFriend">
 		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
@@ -2504,6 +2482,13 @@ Vous ne pouvez pas voler ici.
 	<notification name="DynamicPathfindingDisabled">
 		La recherche de chemin dynamique n&apos;est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles. Pour que les objets mobiles se comportent correctement, cliquez sur Refiger la région. Pour plus d&apos;informations, choisissez Aide.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Aide" ignoretext="La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Une erreur est survenue. Un problème réseau ou serveur s&apos;est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2766,7 +2751,7 @@ Acceptez-vous ?
 	<notification name="ScriptQuestionCaution">
 		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
   
-N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
+Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
 			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
@@ -3347,633 +3332,4 @@ Désactivation des mises à jour futures de ce fichier...
 		Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
 		<usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar figé.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] vous a libéré.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar libéré.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Vous n&apos;avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Vous n&apos;êtes plus figé, vous pouvez reprendre votre vie.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Impossible de figer cet utilisateur.
-	</notification>
-	<notification name="NowOwnObject">
-		Vous êtes désormais le propriétaire de l&apos;objet [OBJECT_NAME].
-	</notification>
-	<notification name="CantRezOnLand">
-		Impossible de rezzer l&apos;objet à [OBJECT_POS] car le propriétaire de ce terrain de l&apos;autorise pas.  Utilisez l&apos;outil Terrain pour voir à qui appartiennent les terrains.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Impossible de rezzer l&apos;objet car il y a trop de demandes.
-	</notification>
-	<notification name="SitFailCantMove">
-		Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n&apos;est pas autorisée.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Essayez de vous rapprocher.  Impossible de vous asseoir sur l&apos;objet car
-il ne se trouve pas dans la même région que vous.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Création d&apos;un nouvel objet impossible. La région est pleine.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Vous ne pouvez pas créer d&apos;arbres ni d&apos;herbe sur un terrain qui ne vous appartient pas.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Échec de la copie car vous ne disposez pas des droits requis pour copier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Échec de la copie car l&apos;objet [OBJ_NAME] ne peut pas vous être transféré.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Échec de la copie car l&apos;objet [OBJ_NAME] contribue au maillage de navigation.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Dupliquer sans objet racine sélectionné
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Impossible de dupliquer les objets car la région est pleine.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Création de l&apos;objet impossible car 
-la parcelle est pleine.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Échec d&apos;une tentative pour rezzer un objet.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Impossible de créer l&apos;article qui a provoqué des problèmes pour cette région.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Cet article d&apos;inventaire a été placé sur liste noire.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Recherche de terrain bloquée.
-Vous avez effectué trop de recherches de terrain trop rapidement.
-Veuillez réessayer dans une minute.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Ressources de script insuffisantes pour attacher cet objet.
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Vous êtes mort et avez été téléporté à votre domicile.
-	</notification>
-	<notification name="EjectComingSoon">
-		Votre présence ici n&apos;est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Vous ne pouvez pas pénétrer dans cette région car 
-le serveur est plein.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Le réenregistrement dans l&apos;inventaire a été désactivé.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car l&apos;objet à partir duquel il a été rezzé n&apos;existe plus.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l&apos;objet [DEST_NAME].
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Impossible de réenregistrer [OBJ_NAME] dans l&apos;inventaire -- cette opération a été désactivée.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Vous ne pouvez pas copier votre sélection car vous n&apos;avez pas le droit de copier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		La suppression de l&apos;objet [OBJ_NAME] du simulateur n&apos;est pas autorisée par le système de droits.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Vous ne pouvez pas enregistrer votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Vous ne pouvez pas enregistrer votre sélection car l&apos;objet [OBJ_NAME] ne peut pas être copié.
-	</notification>
-	<notification name="NoModNoTaking">
-		Vous ne pouvez pas prendre votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="RezDestInternalError">
-		Erreur interne : type de destination inconnue.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Échec de la suppression car l&apos;objet est introuvable
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Exclusion de cet utilisateur impossible.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Cette région ne vous permet pas d&apos;y définir votre domicile.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
-	</notification>
-	<notification name="HomePositionSet">
-		Emplacement du domicile défini.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar expulsé.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Vous n&apos;avez pas pu réaliser l&apos;exclusion car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car il n&apos;y a pas suffisamment de ressources pour cet objet sur cette parcelle.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car l&apos;autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Vous n&apos;êtes pas autorisé à modifier cet objet.
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Impossible d&apos;activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Impossible d&apos;activer les propriétés physiques pour les objets avec images-clés.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Impossible d&apos;activer les propriétés physiques pour l&apos;objet -- ressources de terrain insuffisantes.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Impossible d&apos;activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Cet objet ne peut pas contenir de morceau concave car c&apos;est un fantôme qui contribue au maillage de navigation.
-	</notification>
-	<notification name="UnableAddItem">
-		Ajout de l&apos;article impossible.
-	</notification>
-	<notification name="UnableEditItem">
-		Modification impossible
-	</notification>
-	<notification name="NoPermToEdit">
-		Modification interdite.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Pas autorisé à copier cet inventaire.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Impossible d&apos;enregistrer dans le contenu des objets : L&apos;article n&apos;existe plus.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Impossible d&apos;enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l&apos;inventaire.
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Impossible d&apos;enregistrer dans le contenu des objets : cela modifierait les droits d&apos;attache.
-	</notification>
-	<notification name="TooManyScripts">
-		Trop de scripts.
-	</notification>
-	<notification name="UnableAddScript">
-		Ajout du script impossible.
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Le serveur d&apos;actifs n&apos;a pas répondu assez vite.  Objet renvoyé dans le sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Les formes physiques ne sont pas activées pour cette région.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Impossible de définir les propriétés physiques pour ce type d&apos;objet.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Vous devenez définir une forme pour la prim racine.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Les matériaux physiques ne sont pas activés pour cette région.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Les matériaux physiques ne peuvent être ajustés que pour les prims racines.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		La configuration de matériaux physiques sur les personnages n&apos;est pas prise en charge actuellement.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Une ou plusieurs propriétés des ressources physiques spécifiées n&apos;étaient pas valides.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Vous ne pouvez pas changer le type de raccord d&apos;un objet avec maillage.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Vous ne pouvez pas changer la forme d&apos;un objet avec maillage.
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Échec du lien -- les propriétaires sont différents
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Échec du lien car vous ne disposez pas des droits de modification.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Échec du lien -- trop de primitives
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Échec du lien -- impossible de lier pas de copie et pas de transfert
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Échec du lien - il n&apos;y a rien qui puisse être lié.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Échec du lien -- trop de personnages de recherche de chemin
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Échec du lien -- ressources de terrain insuffisantes
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME].
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Vous avez été téléporté par un élément sur [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Création de l&apos;objet demandé impossible. La région est pleine.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Vous ne pouvez pas attacher plusieurs objets au même endroit.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Vous ne pouvez pas créer plusieurs objets ici.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Création de l&apos;objet demandé impossible. Objet absent de la base de données.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Création de l&apos;objet demandé impossible. Délai d&apos;attente dépassé. Veuillez réessayer.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Création de l&apos;objet demandé impossible. Veuillez réessayer.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Échec de l&apos;action « rezzer », le chargement de l&apos;objet demandé a pris trop longtemps.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Vous ne pouvez pas créer de plantes sur ce terrain.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Impossible de restaurer l&apos;objet. Position dans le monde introuvable.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Impossible de rezzer l&apos;objet car ses données de maillage ne sont pas valides.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Impossible de rezzer l&apos;objet car il y a déjà trop de scripts dans cette région.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Vos privilèges d&apos;accès ne vous autorisent pas à créer des objets à cet endroit.
-	</notification>
-	<notification name="CantCreateObject">
-		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Paramètres d&apos;objet non valides
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Vos privilèges d&apos;accès ne vous autorisent pas à dupliquer des objets ici.
-	</notification>
-	<notification name="CantChangeShape">
-		Vous n’êtes pas autorisé à modifier cette forme.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Vos privilèges d&apos;accès ne vous autorisent pas à revendiquer des objets ici.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Vos privilèges d&apos;accès ne vous autorisent pas à acheter des objets ici.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Impossible d&apos;attacher l&apos;objet car un avatar est assis dessus.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Les arbres et les plantes ne peuvent pas être portés sous forme d&apos;éléments attachés.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Impossible d&apos;attacher les objets appartenant au groupe.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Impossible d&apos;attacher les objets contribuant au maillage de navigation.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Impossible d&apos;attacher l&apos;objet car vous n&apos;avez pas le droit de le déplacer.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Ressources de script insuffisantes pour attacher cet objet.
-	</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>
-	<notification name="CantDropMeshAttachment">
-		Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l&apos;inventaire puis rezzez-les dans le monde.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		L&apos;élément n&apos;a pas pu être déposé : vous n&apos;avez pas le droit de déposer des éléments à cet endroit.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		L&apos;élément n&apos;a pas pu être déposé : ressources de terrain disponibles insuffisantes.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Les éléments n&apos;ont pas pu être déposés : ressources disponibles insuffisantes.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Impossible de déposer l&apos;objet ici.  La parcelle est pleine.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Veuillez affiner vos paramètres de suppression.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Chargement de l&apos;actif impossible.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Impossible de trouver l&apos;utilisateur à téléporter chez lui
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		échec de la demande de type divine
-	</notification>
-	<notification name="GenericRequestFailed">
-		échec de la demande générique
-	</notification>
-	<notification name="CantUploadPostcard">
-		Chargement de la carte postale impossible.  Réessayez ultérieurement.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Impossible récupérer les détails de l&apos;inventaire pour la notice au groupe.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Impossible d&apos;envoyer une notice au groupe -- ce n&apos;est pas autorisé.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Impossible d&apos;envoyer une notice au groupe - échec de la construction de l&apos;inventaire.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Impossible d&apos;analyser l&apos;inventaire dans la notice.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Échec du chargement du terrain.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Fichier de terrain écrit
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Fichier de terrain écrit, lancement du téléchargement...
-	</notification>
-	<notification name="TerrainBaked">
-		Terrain figé.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Vous devez mettre votre client à jour pour acheter cette parcelle.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Achat impossible, cette parcelle n&apos;est pas à vendre.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Achat impossible, le prix de vente ou la zone de terrain a changé.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Vous n&apos;êtes pas un acheteur autorisé pour cette parcelle.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d&apos;une autorisation d&apos;achat.
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Vous ne pouvez pas construire d&apos;objets ici car cela saturerait la parcelle.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -&gt; Signaler un bug...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Le terrain a été divisé.
-	</notification>
-	<notification name="PassPurchased">
-		Vous avez acheté un pass.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Cette région n&apos;autorise pas les petites annonces.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Votre pass pour ce terrain arrive à expiration.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Il n&apos;y a pas de surface appropriée sur laquelle s&apos;asseoir, essayez un autre endroit.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Pas de place pour s&apos;asseoir ici, essayez un autre endroit.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Échec de la revendication de l&apos;objet car vous ne disposez pas des droits requis.
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Échec de la revendication de l&apos;objet car vous ne disposez pas de suffisamment de L$.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Impossible de céder un terrain appartenant au groupe.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Échec de l&apos;achat de l&apos;objet car vous ne disposez pas de suffisamment de L$.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Échec de l&apos;achat d&apos;inventaire car vous ne disposez pas de suffisamment de L$.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Impossible d&apos;acheter le pass actuellement.  Réessayez ultérieurement.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Création de l&apos;objet impossible car \nla parcelle est pleine.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Impossible de créer le repère pour l&apos;événement.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Grâce à vos pouvoirs de type divin, vous n&apos;êtes plus figé.
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée.
-	</notification>
-	<notification name="ExpireExplanation">
-		Le système ne peut pas traiter votre demande actuellement. Délai d&apos;attente dépassé.
-	</notification>
-	<notification name="DieExplanation">
-		Le système ne peut pas traiter votre demande.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Fonds insuffisants pour créer la primitive.
-	</notification>
-	<notification name="RezObjectFailure">
-		Fonds insuffisants pour créer l&apos;objet.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Réinitialiser l&apos;emplacement du domicile car il n&apos;était pas légal.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Cette région ne vous permet pas d&apos;y définir votre domicile.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
-	</notification>
-	<notification name="SetHomePosition">
-		Emplacement du domicile défini.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Impossible de dérezzer l&apos;objet à cause d&apos;un défaut d&apos;inventaire.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Création de l&apos;inventaire demandé impossible.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Création du dossier d&apos;inventaire demandé impossible.
-	</notification>
-	<notification name="CantCreateInventory">
-		Création de cet inventaire impossible.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Création du repère impossible.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Création de la tenue impossible. Veuillez réessayer dans une minute.
-	</notification>
-	<notification name="InventoryNotForSale">
-		L&apos;inventaire n&apos;est pas à vendre.
-	</notification>
-	<notification name="CantFindInvItem">
-		Objet de l&apos;inventaire introuvable.
-	</notification>
-	<notification name="CantFindObject">
-		Objet introuvable.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Les transferts d&apos;argent aux objets sont actuellement désactivés dans cette région.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Impossible de savoir qui payer.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Vous ne pouvez pas donner de L$ à des objets publics.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Échec de la création d&apos;inventaire sur l&apos;objet Second Life.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Une erreur interne nous a empêchés de mettre votre client à jour correctement.  Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Impossible de créer de grandes prims qui coupent d&apos;autres joueurs.  Réessayez une fois que les autres joueurs se seront déplacés.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier.
-		<usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés.
-		<usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Impossible de déplacer les fichiers. Chemin précédent rétabli.
-		<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
index c8fa9f340f..54b8f53e59 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/>
 	<icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/>
 	<icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/>
-	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
index 0e2b5a9c93..96add2a74b 100644
--- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtrer" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l&apos;objet sélectionné"/>
-		<menu_button name="view_btn" tool_tip="Options de tri"/>
-		<menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/>
-		<button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
+	<text name="title_text">
+		Liste des ignorés
+	</text>
+	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
+	<button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
+	<button label="Ignorer un objet par son nom" label_selected="Ignorer un objet par son nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
+	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
deleted file mode 100644
index ebf18f6483..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(chargement)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
deleted file mode 100644
index 9c277842b5..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/>
-	<icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/>
-	<button name="delete_btn" tool_tip="Supprimer cette entrée"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
index b1b32af7c6..5fb69d1989 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Inconnu"/>
-	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 227ce26df7..f035853efc 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -14,53 +14,81 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_filtered_friends_msg">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher].
 	</string>
+	<string name="people_filter_label" value="Filtrer les personnes"/>
+	<string name="groups_filter_label" value="Filtrer les groupes"/>
 	<string name="no_filtered_groups_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/>
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
+	<filter_editor label="Filtre" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtrer les personnes" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<menu_button name="nearby_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
+				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
 			</panel>
 		</panel>
-		<panel label="AMIS" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtrer les personnes" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<menu_button name="friends_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
-				<dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
-			</panel>
+		<panel label="MES AMIS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Afficher d&apos;autres options"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis."/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GROUPES" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtrer les groupes" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/>
-				<menu_button name="groups_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
-				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
+		<panel label="MES GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
+				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
 			</panel>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtrer les personnes" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<menu_button name="recent_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
-				<dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
+				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
 			</panel>
 		</panel>
-		<panel label="BLOQUÉ" name="blocked_panel">
-			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 972190dc15..550beb653e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
-		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
-		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Taille de la police :
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Petite" name="Small" value="0"/>
-			<item label="Moyenne" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Bulles de chat" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notifications
-		</text>
-		<text name="friend_ims">
-			IM amis :
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IM non amis :
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="conference_ims">
-			IM conférence :
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="group_chat">
-			Chat de groupe :
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat près de moi :
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Écouter le son :
-		</text>
-		<check_box label="Nouvelle conversation" name="new_conversation"/>
-		<check_box label="Appel entrant" name="incoming_voice_call"/>
-		<check_box label="Offre de téléportation" name="teleport_offer"/>
-		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Effacer le journal..." name="clear_log"/>
-		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
-		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Taille de la police :
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Petite" name="radio" value="0"/>
+		<radio_item label="Moyenne" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
+	<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Afficher les IM dans :
+	</text>
+	<text name="requires_restart_label">
+		(redémarrage requis)
+	</text>
+	<radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)">
+		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
+		<radio_item label="Onglets" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Activer les popups de chat entrant :
+	</text>
+	<check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message de chat de groupe."/>
+	<check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message instantané."/>
+	<spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/>
+	<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
 	<button label="Traduction..." name="ok_btn"/>
 	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
 	<button label="Orthographe..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 533c392d6b..66b84af3aa 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="Jamais" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Réponse Ne pas déranger
+		Réponse si occupé(e) :
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index 896dd932e3..60027d41cb 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 			<combo_box.item label="Ouvrir" name="Open"/>
-			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 69ed20f376..6a2a3f559a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=fr-FR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
@@ -622,8 +622,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AvatarAway">
 		Absent
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Ne pas déranger
+	<string name="AvatarBusy">
+		Occupé
 	</string>
 	<string name="AvatarMuted">
 		Bloqué(e)
@@ -859,12 +859,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ST_NO_JOINT">
 		Impossible de trouver ROOT ou JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat près de moi
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat près de moi)
-	</string>
 	<string name="whisper">
 		chuchote :
 	</string>
@@ -928,15 +922,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
-	<string name="NotConnected">
-		Pas connecté(e)
-	</string>
-	<string name="AgentNameSubst">
-		(Vous)
-	</string>
 	<string name="TeleportYourAgent">
 		Vous téléporter
 	</string>
+	<string name="NotConnected">
+		Pas connecté(e)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1018,6 +1009,18 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="dictionary_files">
 		Dictionnaires
 	</string>
+	<string name="AvatarSetNotAway">
+		Présent
+	</string>
+	<string name="AvatarSetAway">
+		Absent
+	</string>
+	<string name="AvatarSetNotBusy">
+		Pas occupé
+	</string>
+	<string name="AvatarSetBusy">
+		Occupé
+	</string>
 	<string name="shape">
 		Silhouette
 	</string>
@@ -1986,8 +1989,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Ce résident a activé Ne pas déranger et verra votre message plus tard.
+	<string name="BusyModeResponseDefault">
+		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
 	</string>
 	<string name="MuteByName">
 		(par nom)
@@ -2100,6 +2103,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Contenus
+	</string>
 	<string name="AcquiredItems">
 		Objets acquis
 	</string>
@@ -3871,7 +3877,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Région de type Général
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Les avatars à l&apos;extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l&apos;intérieur.
+		Avatars visibles et chat autorisé en dehors de cette parcelle
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu&apos;elle n&apos;est pas refigée.
@@ -3948,12 +3954,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM, sous Préférences/Confidentialité.
 	</string>
-	<string name="OnlineStatus">
-		En ligne
-	</string>
-	<string name="OfflineStatus">
-		Hors ligne
-	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
@@ -3963,9 +3963,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Vous avez rejoint l&apos;appel
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Vous avez automatiquement refusé l&apos;appel vocal quand le mode Ne pas déranger était activé.
-	</string>
 	<string name="name_started_call">
 		[NAME] appelle.
 	</string>
@@ -3982,7 +3979,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Connexion en cours...
 	</string>
 	<string name="conference-title">
-		Chat à plusieurs
+		Conférence ad-hoc
 	</string>
 	<string name="conference-title-incoming">
 		Conférence avec [AGENT_NAME]
@@ -4862,9 +4859,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversations
-	</string>
 	<string name="Command_Compass_Label">
 		Boussole
 	</string>
@@ -4940,9 +4934,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Tooltip">
 		Parler aux personnes près de vous par chat écrit
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Parler à quelqu&apos;un
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Boussole
 	</string>
@@ -5072,13 +5063,4 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
deleted file mode 100644
index 8354824ed1..0000000000
--- a/indra/newview/skins/default/xui/it/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtro persone" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
deleted file mode 100644
index d0e9c8ee0e..0000000000
--- a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSAZIONE:">
-	<floater.string name="Title">
-		CONVERSAZIONE: [NAME]
-	</floater.string>
-	<text name="page_label" value="Pagina"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
index 10cf1b7f7e..fb8e77b32f 100644
--- a/indra/newview/skins/default/xui/it/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAZIONI">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/>
-					<button name="add_btn" tool_tip="Avvia una nuova conversazione"/>
-					<button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/>
-					<text name="stub_textbox">
-						Questa conversazione in una finestra separata.   [secondlife:/// Ripristina conversazione.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSAZIONI"/>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index d38ec7a5fe..3d9d17fc81 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/>
-	<floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/>
-	<floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/>
-	<floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/>
-	<floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/>
-	<floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l&apos;elenco dei partecipanti"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/>
-				<button name="voice_call_btn" tool_tip="Apri collegamento voce"/>
-				<button name="close_btn" tool_tip="Termina questa conversazione"/>
-				<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduci chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="A" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="A" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index 566920209d..a95ed44662 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ti sta chiamando.
+		sta chiamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha aderito ad una chiamata in chat vocale in conferenza.
@@ -25,9 +25,9 @@
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
-		Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente.
+		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</text>
-	<button label="Risposta" label_selected="Risposta" name="Accept"/>
-	<button label="Ignora" label_selected="Ignora" name="Reject"/>
-	<button label="Apri invece IM" name="Start IM"/>
+	<button label="Accetta" label_selected="Accetta" name="Accept"/>
+	<button label="Rifiuta" label_selected="Rifiuta" name="Reject"/>
+	<button label="Inizia IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 7777444161..77be220a2a 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostra:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Mondo" name="show_world"/>
 			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index 27a17868a7..c97a91bb3f 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Default" label_selected="Default" name="Default"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
 	<button label="Niente" label_selected="Niente" name="None"/>
-	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Anteprima dal vivo" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Anteprima disattivata"/>
 	<filter_editor label="Filtro texture" name="inventory search editor"/>
 	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
deleted file mode 100644
index b168d067c2..0000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE">
-	<slider label="Chat vocale" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index f102622f5d..c83b11f698 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
+<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE">
 	<string name="no_voice_effect">
 		(Nessuna manipolazione voce)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
deleted file mode 100644
index eaeda7597f..0000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUME VOCE">
-	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
index 984e4a1611..10524ba92d 100644
--- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
deleted file mode 100644
index 46ced93f1d..0000000000
--- a/indra/newview/skins/default/xui/it/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
-	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
-	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
-	<menu_item_call label="Vedi profilo" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Offri teleport" name="offer_teleport"/>
-	<menu_item_call label="Chiamata a voce" name="voice_call"/>
-	<menu_item_call label="Cronologia chat..." name="chat_history"/>
-	<menu_item_call label="Aggiungi amico" name="add_friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
-	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Mappa" name="map"/>
-	<menu_item_call label="Condividi" name="share"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_check label="Blocca voce" name="block_unblock"/>
-	<menu_item_check label="Blocca testo" name="MuteText"/>
-	<menu_item_call label="Profilo del gruppo" name="group_profile"/>
-	<menu_item_call label="Attiva gruppo" name="activate_group"/>
-	<menu_item_call label="Lascia il gruppo" name="leave_group"/>
-	<context_menu label="Opzioni moderatore" name="Moderator Options">
-		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
-		<menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
-		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
deleted file mode 100644
index 5686a902eb..0000000000
--- a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Chiamata a voce..." name="Call"/>
-	<menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/>
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
-	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Invita al gruppo..." name="Invite"/>
-	<menu_item_call label="Mappa" name="Map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
deleted file mode 100644
index 73b05831ef..0000000000
--- a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
-	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
-	<menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/>
-	<menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
deleted file mode 100644
index 1621d57e12..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Aggiungi come amico" name="Add Friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Offri teleport" name="offer_teleport"/>
-	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
-	<menu_item_call label="Cronologia chat..." name="chat_history"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Mappa" name="map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca voce" name="Block/Unblock"/>
-	<menu_item_check label="Blocca testo" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
deleted file mode 100644
index 350fbc5c6f..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Vista compatta" name="compact_view"/>
-	<menu_item_check label="Vista espansa" name="expanded_view"/>
-	<menu_item_check label="Mostra orario" name="IMShowTime"/>
-	<menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 9623775af4..0f347b1a90 100644
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
 	<menu_item_call label="Blocca..." name="Block"/>
-	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
-	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 3ac0c5ce69..09fc867d7c 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Nuovi capelli" name="New Hair"/>
 		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Apri tutte le cartelle" name="expand"/>
-	<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml
deleted file mode 100644
index c87cda57bf..0000000000
--- a/indra/newview/skins/default/xui/it/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/>
-	<menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/>
-	<menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/>
-	<menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/>
-	<menu_item_call label="Preferenze chat..." name="chat_preferences"/>
-	<menu_item_call label="Preferenze privacy..." name="privacy_preferences"/>
-	<menu_item_check label="Registro conversazioni..." name="Conversation"/>
-	<menu_item_check label="Traduci chat vicina" name="Translate_chat"/>
-	<menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
deleted file mode 100644
index e9955923b2..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Sblocca" name="unblock"/>
-	<menu_item_call label="Profilo..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
deleted file mode 100644
index cbcf084b86..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/>
-	<menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
deleted file mode 100644
index fc80c73ae3..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
-	<menu_item_check label="Ordina in base al tipo" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
deleted file mode 100644
index 972e359cfe..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
-	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
-	<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
-	<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
index 8ca7537ee0..30a97a1c72 100644
--- a/indra/newview/skins/default/xui/it/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Mostra informazioni" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Chiamata a voce" name="Call"/>
+	<menu_item_call label="Chiama" name="Call"/>
 	<menu_item_call label="Attiva" name="Activate"/>
 	<menu_item_call label="Chiudi" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
deleted file mode 100644
index 56b9abbd3a..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index 1c09b1cfe2..a974bd181d 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Vedi profilo" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
-	<menu_item_call label="Chiamata a voce" name="voice_call"/>
-	<menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/>
-	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Mappa" name="map"/>
-	<menu_item_call label="Condividi" name="share"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Aggiungi amico" name="Add Friend"/>
+	<menu_item_call label="Rimuovi amico" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Mappa" name="Map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
index b9ce70167f..e0b9ceb63d 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Aggiungi amici" name="add_friends"/>
-	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Chiama" name="call"/>
-	<menu_item_call label="Condividi" name="share"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
+	<menu_item_call label="Aggiungi amici" name="Add Friends"/>
+	<menu_item_call label="Rimuovi amici" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
deleted file mode 100644
index 223d88fee1..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
-	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
-	<menu_item_check label="Mostra mappa" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
deleted file mode 100644
index fc6213bd08..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index abfbab35a3..37755d5749 100644
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Vedi profilo" name="show_agent"/>
-	<menu_item_call label="Manda IM..." name="send_im"/>
-	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
+	<menu_item_call label="Mostra profilo residente" name="show_agent"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 8456d14b63..763e65f17c 100644
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profilo oggetto..." name="show_object"/>
+	<menu_item_call label="Mostra informazioni oggetto" name="show_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index c93b92029f..547c5a9b73 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Stato" name="Status"/>
+		<menu label="Stato" name="Status">
+			<menu_item_call label="Assente" name="Set Away"/>
+			<menu_item_call label="Non disponibile" name="Set Busy"/>
+		</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="Dashboard dell&apos;account..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
-		<menu_item_check label="Conversazioni..." name="Conversations"/>
-		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
+		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
-		<menu label="Manipolazione voce" name="VoiceMorphing">
-			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
-			<menu_item_check label="Anteprima..." name="Preview"/>
-			<menu_item_call label="Abbonati..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Impostazioni voce..." name="Nearby Voice"/>
+		<menu_item_check label="Manipolazione voce..." name="ShowVoice"/>
 		<menu_item_check label="Gesture..." name="Gestures"/>
-		<menu_item_check label="Amici" name="My Friends"/>
-		<menu_item_check label="Gruppi" name="My Groups"/>
-		<menu_item_check label="Persone vicine" name="Active Speakers"/>
+		<menu_item_call label="Amici" name="My Friends"/>
+		<menu_item_call label="Gruppi" name="My Groups"/>
+		<menu_item_call label="Persone vicine" name="Active Speakers"/>
 		<menu_item_call label="Blocca lista" name="Block List"/>
 	</menu>
 	<menu label="Mondo" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Acquista" name="Menu Object Buy"/>
 			<menu_item_call label="Prendi" name="Menu Object Take"/>
 			<menu_item_call label="Prendi copia" name="Take Copy"/>
+			<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opzioni" name="Options">
 			<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Istruzioni..." name="How To"/>
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Guida dell&apos;utente" name="User’s guide"/>
-		<menu_item_call label="Base di conoscenza" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Forum della comunità" name="Community Forums"/>
-		<menu_item_call label="Portale assistenza" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
 		<menu_item_call label="Segnala abuso" name="Report Abuse"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
@@ -344,14 +336,9 @@
 				<menu_item_call label="Alterna la geometria dei personaggi" name="Toggle Character Geometry"/>
 				<menu_item_check label="Consenti selezione avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Velocità animazione" name="Animation Speed">
-				<menu_item_call label="Accelera tutte le animazioni del 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="Rallenta tutte le animazioni del 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="Ripristina la velocità di tutte le animazioni" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Forza i parametri sui valori predefiniti" name="Force Params to Default"/>
 			<menu_item_check label="Informazioni sull&apos;animazione" name="Animation Info"/>
+			<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
 			<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 bersaglio" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 8adbebb62a..d5fdde4e7d 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -513,24 +513,6 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
-
-    Visitare [_URL] per cercare un aggiornamento del driver?
-		<url name="url">
-			http://support.amd.com/it/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
-
-    Visitare [_URL] per cercare un aggiornamento del driver?
-		<url name="url">
-			http://www.nvidia.it/Download/index.aspx?lang=it
-		</url>
-		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -1566,13 +1548,10 @@ Vuoi cancellare quell&apos;elemento?
 		Impossibile offrire l&apos;amicizia in questo momento. Riprova fra poco.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Non disturbare è attivo.  Non riceverai la notifica delle comunicazioni in arrivo.
-
-- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze &gt; Generali).
-- Le offerte di teleport verranno rifiutate.
-- Le chiamate voce verranno rifiutate.
-		<usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		È stata impostata la modalità Non disponibile.
+La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino.
+		<usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l&apos;offerta.
@@ -2060,10 +2039,6 @@ Trasferisci gli elementi nell&apos;inventario?
 		Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account?
 		<usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione.  Tutti i partecipanti riceveranno notifiche per la nuova conversazione.
-		<usetemplate ignoretext="Conferma l&apos;aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Confermi di voler uscire?
 		<usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/>
@@ -2138,14 +2113,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 			<button ignore="Never Replace" name="No" text="Annulla"/>
 		</form>
 	</notification>
-	<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
-		Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
+	<notification label="Avviso di &apos;Occupato&apos;" name="BusyModePay">
+		Sei in modalità &apos;Occupato&apos;, ciò significa che non riceverai ciò che attendi per questo pagamento.
 
-Vuoi disattivare la modalità Non disturbare prima di completare questa transazione?
+Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/>
-			<button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/>
-			<button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/>
+			<ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/>
+			<button ignore="Always leave Busy Mode" name="Yes" text="OK"/>
+			<button ignore="Never leave Busy Mode" name="No" text="Abbandona"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2280,8 +2255,11 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 	<notification name="GroupNotice">
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è online
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è offline
 	</notification>
 	<notification name="AddSelfFriend">
 		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
@@ -2509,6 +2487,13 @@ Qui non puoi volare.
 	<notification name="DynamicPathfindingDisabled">
 		Il pathfinding dinamico non è attivato in questa regione.  Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento.  Per fare in modo che gli oggetti in movimento si comportino correttamente, fai clic sul pulsante &quot;Rebake regione&quot;.  Per maggiori informazioni, seleziona la guida
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Guida" ignoretext="Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Si è verificato un errore.  Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione.  A volte il problema viene risolto uscendo ed eseguendo nuovamente l&apos;accesso.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2769,9 +2754,9 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
   
-Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
+Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
 			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
@@ -3353,633 +3338,4 @@ Tentativo annullato.
 		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
 		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar congelato.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] ti ha scongelato.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar scongelato.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		La congelazione non ha avuto successo perché non hai le autorizzazioni dell&apos;amministratore per quel lotto.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Non sei più congelato, puoi continuare.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Non puoi congelare quell&apos;utente.
-	</notification>
-	<notification name="NowOwnObject">
-		Sei ora il proprietario dell&apos;oggetto [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Non puoi rezzare l&apos;oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno.  Usa lo strumento terreno per visualizzare a chi appartiene il terreno.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Oggetto non razzato perché ci sono troppe richieste.
-	</notification>
-	<notification name="SitFailCantMove">
-		Non puoi sederti perché al momento non puoi muoverti.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Non puoi sederti perché non ti è consentito entrare in quel terreno.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Proba ad avvicinarti.  Non puoi sederti su un oggetto perché
-non è nella stessa regione in cui ti trovi.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Impossibile creare il nuovo oggetto. La regione è piena.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Non puoi creare alberi ed erba su terreni che non sono di tua proprietà.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Copia non riuscita perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; non può essere trasferito a te.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; contribuisce al navmesh.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Duplicato senza oggetto principale selezionato.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Impossibile duplicare gli oggetti perché la regione è piena.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Impossibile creare l&apos;oggetto perché 
-il lotto è pieno.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Tentativo di rezzare un oggetto non riuscito.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Impossibile creare un oggetto che ha causato problemi in questa regione.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		L&apos;oggetto dell&apos;inventario è stato aggiunto alla blacklist.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Al momento non ti è consentito creare oggetti.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Ricerca terreno bloccata.
-Hai eseguito troppe ricerche terreno in un breve tempo.
-Riprova tra un minuto.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Risorse di script non sufficienti per collegare l&apos;oggetto.
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Sei deceduto e sei stato teleportato alla tua posizione iniziale
-	</notification>
-	<notification name="EjectComingSoon">
-		Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Non puoi entrare in questa regione perché 
-il server è pieno.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Opzione Salva nell&apos;inventario disattivata
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché l&apos;oggetto da cui è stato razzato non esiste più.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[DEST_NAME]&apos;.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Impossibile riportare &apos;[OBJ_NAME]&apos; nell&apos;inventario -- questa operazione è stata disattivata.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Non puoi copiare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		La rimozione dell&apos;oggetto &apos;[OBJ_NAME]&apos; dal simulatore non è consentita dal sistema delle autorizzazioni.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Non puoi salvare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Non puoi salvare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere copiato.
-	</notification>
-	<notification name="NoModNoTaking">
-		Non puoi prendere l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="RezDestInternalError">
-		Errore interno: Tipo di destinazione sconosciuto.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Cancellazione non riuscita perché l&apos;oggetto non è stato trovato.
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Non puoi espellere quell&apos;utente.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Questa regione non ti consente di impostare qui la tua posizione iniziale.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
-	</notification>
-	<notification name="HomePositionSet">
-		Posizione di base impostata.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar espulso.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		L&apos;espulsione non ha avuto successo perché non hai l&apos;autorizzazione dell&apos;amministratore del lotto.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l&apos;oggetto su questo lotto.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché nell&apos;altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Non hai l&apos;autorizzazione necessaria per modificare questa immagine
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Impossibile attivare la fisica per oggetti keyframe.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Impossibile attivare la fisica per l&apos;oggetto -- risorse di terreno insufficienti.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh.
-	</notification>
-	<notification name="UnableAddItem">
-		Aggiunta elemento non riuscita
-	</notification>
-	<notification name="UnableEditItem">
-		Impossibile modificare questo elemento.
-	</notification>
-	<notification name="NoPermToEdit">
-		Non sei autorizzato a modificare questo elemento.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Non ti è permesso copiare quell&apos;inventario.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Impossibile salvare i contenuti dell&apos;oggetto: L&apos;elemento non esiste più.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Impossibile salvare i contenuti dell&apos;oggetto: Nell&apos;inventario esiste già un elemento con quel nome.
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Impossibile salvare i contenuti dell&apos;oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
-	</notification>
-	<notification name="TooManyScripts">
-		Troppi script.
-	</notification>
-	<notification name="UnableAddScript">
-		Aggiunta script non riuscita.
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Il server degli asset non ha inviato una risposta entro il tempo massimo.  Oggetto restituito al sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		In questa regione non sono attivate le forme per la fisica.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Non puoi modificare il navmesh attraverso il confine tra le regioni.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Impossibile impostare le proprietà della fisica per quel tipo di oggetto.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		impossibile impostare un prim principale senza forma.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		In questa regione non sono attivati i materiali per la fisica.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		I materiali per la fisica possono essere modificati solo i prim principali.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		L&apos;impostazione dei materiali per la fisica nei caratteri non è ancora supportata.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Almeno una delle proprietà dei materiali per la fisica non è valida.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Non puoi alterare il tipo di punto di un oggetto con reticolo
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Non puoi alterare la forma di un oggetto con reticolo
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Non puoi entrare in questa regione perché è piena.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Collegamento non riuscito -- i proprietari non corrispondono
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Collegamento non riuscito -- troppe primitive.
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Collegamento non riuscito -- niente di collegabile.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Collegamento non riuscito -- troppi personaggi con pathfinding
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Collegamento non riuscito -- risorse terreno non sufficienti
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		L&apos;oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Sei stato teleportato nella posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos; del lotto &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Sei stato teleportato nella tua posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di un utente sconosciuto.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Impossibile creare l&apos;oggetto richiesto. La regione è piena.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Non puoi collegare più oggetti a un singolo luogo.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Non puoi creare oggetti multipli in questa posizione.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Impossibile creare l&apos;oggetto richiesto. L&apos;oggetto non è presente nel database.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Impossibile creare l&apos;oggetto richiesto. Tempo scaduto per la richiesta. Riprova.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Impossibile creare l&apos;oggetto richiesto. Riprova.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Rezzing non riuscito. Il caricamento dell&apos;oggetto richiesto è durato troppo a lungo.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Non puoi creare piante su questo terreno.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Impossibile ripristinare l&apos;oggetto. Nessuna posizione trovata nel mondo virtuale.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Impossibile rezzare l&apos;oggetto perché i dati del reticolo non sono validi.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Impossibile rezzare l&apos;oggetto perché ci sono già troppi script in questa regione.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione.
-	</notification>
-	<notification name="CantCreateObject">
-		Al momento non ti è consentito creare oggetti.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Parametri oggetto non validi
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione.
-	</notification>
-	<notification name="CantChangeShape">
-		Non ti è consentito modificare questa forma.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Assegnazione non riuscita perché non hai l&apos;autorizzazione necessaria per assegnare oggetti per il tuo gruppo.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Impossibile collegare l&apos;oggetto perché un avatar è seduto sopra.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Alberi ed erba non possono essere indossati come collegati.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Impossibile collegare oggetti di proprietà di un gruppo.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Non puoi collegare oggetti che non sono di tua proprietà.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Impossibile collegare oggetti che contribuiscono a navmesh.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		L&apos;oggetto non può essere collegato perché non sei autorizzato a muoverlo.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Risorse di script non sufficienti per collegare l&apos;oggetto.
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Non puoi lasciare elementi collegati con reticolo. Separa nell&apos;inventario e quindi rezza nel mondo virtuale.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Impossibile rimuovere l&apos;elemento collegato: non hai l&apos;autorizzazione necessaria per rimuoverlo qui.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Impossibile rimuovere l&apos;elemento collegato: risorse terreno disponibili non sufficienti.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Non puoi lasciare l&apos;oggetto qui.  Il lotto è pieno.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Limita i parametri per la cancellazione.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Impossibile caricare l&apos;asset.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Utente da teleportare alla posizione iniziale non trovato
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		richiesta superpoteri non riuscita
-	</notification>
-	<notification name="GenericRequestFailed">
-		richiesta generica non riuscita
-	</notification>
-	<notification name="CantUploadPostcard">
-		Impossibile caricare la cartolina.  Riprova più tardi.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		I dettagli dell&apos;inventario per la notifica di gruppo non sono stati trovati.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Impossibile inviare la notifica di gruppo -- non consentita.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Impossibile inviare la notifica di gruppo -- impossibile costruire l&apos;inventario.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Impossibile analizzare l&apos;inventario nella notifica.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Caricamento terreno non riuscito.
-	</notification>
-	<notification name="TerrainFileWritten">
-		File terreno scritto.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		File terreno generato, avvio del download...
-	</notification>
-	<notification name="TerrainBaked">
-		Baking terreno completata.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Devi aggiornare il Viewer per poter acquistare questo lotto.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Impossibile acquistare, questo lotto non è in vendita.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Impossibile acquistare. Il prezzo o l&apos;area del terreno sono stati cambiati.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Non sei l&apos;acquirente autorizzato di questo lotto.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Non puoi acquistare questo lotto perché è in attesa di autorizzazione all&apos;acquisto
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		hai selezionato terreni con proprietari diversi. Seleziona un&apos;area più piccola e riprova.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Non sono stati selezionati abbastanza lotti affittati da collegare.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -&gt; Segnala bug...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Impossibile suddividere il terreno. È stato selezionato l&apos;intero lotto.\nProva a selezionare un pezzo di terreno più piccolo.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Il terreno è stato diviso.
-	</notification>
-	<notification name="PassPurchased">
-		Hai acquistato un pass.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Nella regione non sono permessi gli annunci pubblicitari.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Il tuo pass per questo terreno è quasi scaduto.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Nessuna superficie adatta a sedersi, prova un altro luogo.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Non c&apos;è posto per sedersi, prova un altro luogo.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		La richiesta dell&apos;oggetto non ha avuto successo perché non hai l&apos;autorizzazione necessaria.
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		La richiesta dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Non puoi assegnare terreno di proprietà di un gruppo.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		L&apos;acquisto dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		L&apos;acquisto dell&apos;inventario non ha avuto successo perché non hai L$ sufficienti.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Non hai abbastanza L$ per acquistare un pass per questo terreno.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Al momento non puoi acquistare un pass.  Riprova più tardi.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Impossibile creare l&apos;oggetto perché il lotto è pieno.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Impossibile creare il punto di riferimento per l&apos;evento.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		I tuoi superpoteri hanno interrotto la congelazione.
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Richiesta di poteri speciali non riuscita. La richiesta è stata registrata.
-	</notification>
-	<notification name="ExpireExplanation">
-		Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta.
-	</notification>
-	<notification name="DieExplanation">
-		Il sistema non è in grado di elaborare la tua richiesta.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Denaro insufficiente per creare una primitiva.
-	</notification>
-	<notification name="RezObjectFailure">
-		Denaro insufficiente per creare un oggetto.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Posizione iniziale ripristinata perché non era valida.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Questa regione non ti consente di impostare qui la tua posizione iniziale.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
-	</notification>
-	<notification name="SetHomePosition">
-		Posizione di base impostata.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Impossibile derazzare l&apos;oggetto a causa di un errore nell&apos;inventario.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Impossibile creare l&apos;inventario richiesto.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Impossibile creare la cartella dell&apos;inventario richiesta.
-	</notification>
-	<notification name="CantCreateInventory">
-		Impossibile creare quell&apos;inventario.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Impossibile creare il punto di riferimento.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Il vestiario non può essere creato in questo momento. Riprova tra un minuto.
-	</notification>
-	<notification name="InventoryNotForSale">
-		L&apos;inventario non è in vendita.
-	</notification>
-	<notification name="CantFindInvItem">
-		Impossibile trovare l&apos;elemento nell&apos;inventario.
-	</notification>
-	<notification name="CantFindObject">
-		Impossibile trovare l&apos;oggetto.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Non si capisce chi deve essere pagato.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Non puoi dare L$ a oggetti pubblici.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Creazione inventario non riuscito per un oggetto nel mondo virtuale.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Un errore interno ha impedito l&apos;aggiornamento del Viewer.  Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Non puoi creare prim grandi che intersecano altri giocatori.  Riprova quando gli altri giocatori si sono spostati.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file.
-		<usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L&apos;elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati.
-		<usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Impossibile spostare i file. Il percorso precedente è stato ripristinato.
-		<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index cfceb5b982..ede19b9e5a 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -26,6 +26,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
 	<icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/>
-	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
index 7ca2d3b57b..610f561a65 100644
--- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtro" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/>
-		<menu_button name="view_btn" tool_tip="Opzioni Ordina"/>
-		<menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/>
-		<button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
+	<text name="title_text">
+		Blocca lista
+	</text>
+	<scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
+	<button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/>
+	<button label="Blocca l&apos;oggetto per nome..." label_selected="Blocca l&apos;oggetto per nome..." name="Block object by name..."/>
+	<button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
deleted file mode 100644
index ca6b65300a..0000000000
--- a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(caricamento in corso)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
deleted file mode 100644
index 624eaa639c..0000000000
--- a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/>
-	<icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/>
-	<button name="delete_btn" tool_tip="Elimina questo elemento"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
index 72e644008c..7cdc4c7ff6 100644
--- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Sconosciuto"/>
-	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index e1468db76e..f903ae6e2c 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -14,53 +14,81 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_filtered_friends_msg">
 		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
+	<string name="people_filter_label" value="Filtro persone"/>
+	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
+	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtro persone" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
+				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
 			</panel>
 		</panel>
-		<panel label="AMICI" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtro persone" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/>
-				<dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
-			</panel>
+		<panel label="I MIEI AMICI" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPPI" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtro gruppi" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/>
-				<menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
-				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
+		<panel label="I MIEI GRUPPI" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
+				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
+				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtro persone" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
-				<dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
+				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
 			</panel>
 		</panel>
-		<panel label="BLOCCATO" name="blocked_panel">
-			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index c2ac6e97a9..0c9c4027e5 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
-		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
-		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Dimensioni caratteri:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Piccolo" name="Small" value="0"/>
-			<item label="Medio" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notifiche
-		</text>
-		<text name="friend_ims">
-			IM degli amici:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IM non di amici:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			IM conferenza:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Chat di gruppo:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat nei dintorni:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Riproduci suono:
-		</text>
-		<check_box label="Nuova conversazione" name="new_conversation"/>
-		<check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/>
-		<check_box label="Offerta di Teleport" name="teleport_offer"/>
-		<check_box label="Offerta inventario" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Cancella registro..." name="clear_log"/>
-		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
-		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Dimensioni caratteri:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Piccola" name="radio" value="0"/>
+		<radio_item label="Media" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
+	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Mostra gli IM in:
+	</text>
+	<text name="requires_restart_label">
+		(richiede il riavvio)
+	</text>
+	<radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)">
+		<radio_item label="Finestre separate" name="radio" value="0"/>
+		<radio_item label="Schede" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Attiva popup per chat in arrivo:
+	</text>
+	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
+	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
+	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
+	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
 	<button label="Traduzione..." name="ok_btn"/>
 	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
 	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 45cc06c2ea..90a833471c 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -69,9 +69,6 @@
 		<combo_box.item label="mai" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Risposta Non disturbare:
+		Risposta in modalità occupato:
 	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 5f912dd126..8a0f93e650 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Acquista oggetto" name="Buyobject"/>
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
-			<combo_box.item label="Ingrandisci" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f95318542b..fb1e387468 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=it-IT&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
@@ -616,8 +616,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AvatarAway">
 		Assente
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Non disturbare
+	<string name="AvatarBusy">
+		Occupato
 	</string>
 	<string name="AvatarMuted">
 		Mutato
@@ -853,12 +853,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ST_NO_JOINT">
 		Impossibile trovare ROOT o JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat nei dintorni
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat nei dintorni)
-	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -922,9 +916,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
-	<string name="AgentNameSubst">
-		(Tu)
-	</string>
 	<string name="TeleportYourAgent">
 		Teleportarti
 	</string>
@@ -1009,6 +1000,18 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="dictionary_files">
 		Dizionari
 	</string>
+	<string name="AvatarSetNotAway">
+		Imposta come non assente
+	</string>
+	<string name="AvatarSetAway">
+		Imposta come assente
+	</string>
+	<string name="AvatarSetNotBusy">
+		Imposta come non occupato
+	</string>
+	<string name="AvatarSetBusy">
+		Imposta come occupato
+	</string>
 	<string name="shape">
 		Figura corporea
 	</string>
@@ -1965,8 +1968,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="PanelContentsNewScript">
 		Nuovo script
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Questo residente ha attivato la modalità &apos;Non disturbare&apos; e vedrà il tuo messaggio più tardi.
+	<string name="BusyModeResponseDefault">
+		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
 	</string>
 	<string name="MuteByName">
 		(In base al nome)
@@ -2079,6 +2082,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Contenuto
+	</string>
 	<string name="AcquiredItems">
 		Oggetti acquisiti
 	</string>
@@ -3793,7 +3799,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Regione generale
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Gli avatar in questo lotto non possono essere visti o sentiti da avatar all&apos;esterno del lotto
+		Avatar visibili e chat consentita fuori di questo lotto
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione.
@@ -3870,12 +3876,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Per vedere questo messaggio, devi deselezionare &apos;Solo amici e gruppi possono chiamarmi o mandarmi IM&apos; in Preferenze/Privacy.
 	</string>
-	<string name="OnlineStatus">
-		Online
-	</string>
-	<string name="OfflineStatus">
-		Offline
-	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
@@ -3885,9 +3885,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Ti sei collegato alla chiamata in voce
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità &apos;Non disturbare&apos;.
-	</string>
 	<string name="name_started_call">
 		[NAME] ha iniziato una chiamata vocale
 	</string>
@@ -3900,9 +3897,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Chiusa la chiamata
 	</string>
-	<string name="conference-title">
-		Chat con più persone
-	</string>
 	<string name="conference-title-incoming">
 		Chiamata in conferenza con [AGENT_NAME]
 	</string>
@@ -4775,9 +4769,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversazioni
-	</string>
 	<string name="Command_Compass_Label">
 		Bussola
 	</string>
@@ -4853,9 +4844,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Tooltip">
 		Chatta con persone vicine usando il testo
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Conversa con chiunque
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Bussola
 	</string>
@@ -4985,13 +4973,4 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
deleted file mode 100644
index 98b1a59a0d..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="会話ログ">
-	<panel name="buttons_panel">
-		<filter_editor label="人をフィルター" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
deleted file mode 100644
index ea0b23de48..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="会話:">
-	<floater.string name="Title">
-		会話:[NAME]
-	</floater.string>
-	<text name="page_label" value="ページ"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index a155efdc1e..06b65e27f0 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="会話">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
-					<button name="add_btn" tool_tip="新しい会話を開始"/>
-					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
-					<text name="stub_textbox">
-						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="会話"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index a44c843df7..dfa1c85ca2 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
-	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
-	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
-	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
-				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
-				<button name="close_btn" tool_tip="この会話を終了する"/>
-				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="宛先" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="宛先" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 308f6f9a3d..f152fcd738 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		匿名ユーザー
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		からコールを受けています。
+		がコールしています。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		がコンファレンスチャットで、ボイスチャットに参加しました。
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
 	</floater.string>
 	<text name="question">
-		コールに応答すると、現在のボイスチャットから切断されます。
+		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
 	</text>
-	<button label="取る" label_selected="取る" name="Accept"/>
-	<button label="無視" label_selected="無視" name="Reject"/>
-	<button label="代わりに IM を開く" name="Start IM"/>
+	<button label="はい" label_selected="はい" name="Accept"/>
+	<button label="いいえ" label_selected="いいえ" name="Reject"/>
+	<button label="IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index 9733c61918..ec107f3e6b 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				表示：
 			</text>
-			<check_box label="テスト" name="show_world"/>
+			<check_box label="世界" name="show_world"/>
 			<check_box label="可動物のみ" name="show_world_movables_only"/>
 			<check_box label="ナビメッシュ" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 37233d3e68..3773812bb6 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="ライブプレビュー" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="プレビュー無効"/>
 	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
 	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
deleted file mode 100644
index 44e96c35ad..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="ボイスチャットの音量">
-	<slider label="ボイスチャット" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index b38ea9331a..ee675e143b 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
+<floater label="場所" name="voice_effects" title="ボイスモーフィング">
 	<string name="no_voice_effect">
 		（ボイスモーフィングなし）
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
deleted file mode 100644
index a380615d5a..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="ボイス音量">
-	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index 07bcefd9b3..a071abbd2e 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
deleted file mode 100644
index c7df20d252..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="会話を終える" name="close_conversation"/>
-	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
-	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="フレンドを追加" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-	<menu_item_call label="グループ情報" name="group_profile"/>
-	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
-	<menu_item_call label="グループから脱退する" name="leave_group"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
-		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
deleted file mode 100644
index c9d4f947a4..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="ボイスコール..." name="Call"/>
-	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="Invite"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
deleted file mode 100644
index bd4812603f..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
-	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
deleted file mode 100644
index 55cd6610f7..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
deleted file mode 100644
index 222a741718..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="簡略表示" name="compact_view"/>
-	<menu_item_check label="詳細表示" name="expanded_view"/>
-	<menu_item_check label="時間を表示" name="IMShowTime"/>
-	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 6448e9244e..8c4f328661 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
 	<menu_item_call label="ブロック..." name="Block"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 1969ae2a10..2bcbe1915b 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="髪" name="New Hair"/>
 		<menu_item_call label="目" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="フォルダをすべて開く" name="expand"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
deleted file mode 100644
index 5816351d9d..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
-	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
-	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
-	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
-	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
-	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
-	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
-	<menu_item_check label="会話ログ..." name="Conversation"/>
-	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
-	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
deleted file mode 100644
index b5c9d11e02..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="プロフィール..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
deleted file mode 100644
index 3e74b2ddff..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
-	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
deleted file mode 100644
index 4b86a353f4..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
deleted file mode 100644
index b95d11fdbd..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
-	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 2c0c85ba28..842d79dc4b 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="ボイスコール" name="Call"/>
+	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
deleted file mode 100644
index 4a9e402fa4..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 972ab767bf..8d84b0e521 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
+	<menu_item_call label="プロフィールの表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="地図" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index fe85e278cf..3f20e5d3ab 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="add_friends"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="コール" name="call"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="フレンド登録" name="Add Friends"/>
+	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
deleted file mode 100644
index b7cccc4396..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="地図を表示" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
deleted file mode 100644
index feaeba4398..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 72722db7cc..92d118a5ae 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="プロフィールを表示" name="show_agent"/>
-	<menu_item_call label="IM を送信..." name="send_im"/>
-	<menu_item_call label="フレンドを追加..." name="add_friend"/>
+	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index 9e340e3239..d6a048dcfc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
+	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 6f650242b4..e60e6781c6 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="ログイン" name="Status"/>
+		<menu label="ログイン" name="Status">
+			<menu_item_call label="一時退席中" name="Set Away"/>
+			<menu_item_call label="取り込み中" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
 		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
 		<menu_item_call label="マイアカウント..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="会話..." name="Conversations"/>
-		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
+		<menu_item_check label="チャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
-		<menu label="ボイスモーフィング" name="VoiceMorphing">
-			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
-			<menu_item_check label="プレビュー..." name="Preview"/>
-			<menu_item_call label="申し込む..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="ボイス設定..." name="Nearby Voice"/>
+		<menu_item_check label="ボイスモーフィング..." name="ShowVoice"/>
 		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_check label="フレンド" name="My Friends"/>
-		<menu_item_check label="グループ" name="My Groups"/>
-		<menu_item_check label="近くにいる人" name="Active Speakers"/>
+		<menu_item_call label="フレンド" name="My Friends"/>
+		<menu_item_call label="グループ" name="My Groups"/>
+		<menu_item_call label="近くにいる人" name="Active Speakers"/>
 		<menu_item_call label="リストをブロック" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="買う" name="Menu Object Buy"/>
 			<menu_item_call label="取る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
+			<menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="オプション" name="Options">
 			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="ハウツー..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
-		<menu_item_call label="ユーザーガイド" name="User’s guide"/>
-		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
-		<menu_item_call label="日本語サポートページ" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
 		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
@@ -393,14 +385,9 @@
 				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
 				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="アニメーションのスピード" name="Animation Speed">
-				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
-				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
-				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
-				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
 			<menu_item_check label="アニメーション情報" name="Animation Info"/>
+			<menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
 			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
 			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
 			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 356506f191..d5cff18a24 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -538,24 +538,6 @@ L$ が不足しているのでこのグループに参加することができ
 		</url>
 		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
-
-[_URL] へアクセスして、ドライバーを更新しますか。
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
-
-[_URL] へアクセスして、ドライバーを更新しますか。
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=en-us
-		</url>
-		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -1600,13 +1582,10 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		現在フレンドシップを送れません。数分後にもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		「通知を受けない」がオンになります。着信通信はあなたには通知されません。
-
-- 他の住民は「通知を受けない」の応答（「設定」&gt;「一般」で設定）を受け取ることになります。
-- テレポートのオファーはすべて受け取り拒否となります。
-- ボイスコールは拒否されます。
-		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		取り込み中モードになりました。
+チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
+		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
@@ -2097,10 +2076,6 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
-		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		終了しようとしています。続けますか？
 		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
@@ -2178,14 +2153,14 @@ Linden Lab
 			<button ignore="交換しない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
-	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
-		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
+	<notification label="取り込み中の警告" name="BusyModePay">
+		現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。
 
-このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
+この取引を行うために「取り込み中」の設定を解除しますか？
 		<form name="form">
-			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
-			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
-			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
+			<ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/>
+			<button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/>
+			<button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2321,8 +2296,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="GroupNotice">
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオンラインです
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオフラインです
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2552,6 +2530,13 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="DynamicPathfindingDisabled">
 		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。移動オブジェクトを正しく動作させるには、「地域の再構築」ボタンをクリックします。詳しい情報は見るには「ヘルプ」を選択してください。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="ヘルプ" ignoretext="この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。" name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2812,9 +2797,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
+		警告：オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
   
-そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
+このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
 		<form name="form">
 			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
@@ -3393,627 +3378,4 @@ M キーを押して変更します。
 		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
 		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
-	</notification>
-	<notification name="YouFrozeAvatar">
-		アバターがフリーズされています。
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] によってフリーズが解除されています。
-	</notification>
-	<notification name="AvatarUnFrozen">
-		アバターのフリーズが解除されました。
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		その区画の管理権限を持っていないため、フリーズに失敗しました。
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		フリーズ期間が切れました。仕事に戻ってください。
-	</notification>
-	<notification name="AvatarCantFreeze">
-		残念ながら、そのユーザーをフリーズできません。
-	</notification>
-	<notification name="NowOwnObject">
-		これで、オブジェクト [OBJECT_NAME] の所有者になりました
-	</notification>
-	<notification name="CantRezOnLand">
-		この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		リクエストが多すぎて、オブジェクトを Rez することができません。
-	</notification>
-	<notification name="SitFailCantMove">
-		今回移動できなかったため、座ることができません。
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		その土地に対して許可を受けていないため、座ることができません。
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		新しいオブジェクトを作成できません。リージョンが埋まっています。
-	</notification>
-	<notification name="FailedToPlaceObject">
-		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-	</notification>
-	<notification name="NoOwnNoGardening">
-		所有していない土地に木や草を植えることはできません。
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		オブジェクト &apos;[OBJ_NAME]&apos; をコピーする権限がないため、コピーに失敗しました。
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		オブジェクト &apos;[OBJ_NAME]&apos; をあなたに転送できないため、コピーに失敗しました。
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; がナビメッシュに貢献しているため、コピーに失敗しました。
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		ルートオブジェクトを選択せずに複製します。
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		リージョンが埋まっているため、オブジェクトのコピーを作成することができません。
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		区画がいっぱいのため、
-オブジェクトを作成できません。
-	</notification>
-	<notification name="RezAttemptFailed">
-		オブジェクトへの Rez の試みに失敗しました。
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		このリージョンで問題を引き起こすアイテムは作成できません。
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		その持ち物アイテムはブラックリストに登録されています。
-	</notification>
-	<notification name="NoCanRezObjects">
-		現在あなたにはオブジェクトを作成するための許可がありません。
-	</notification>
-	<notification name="LandSearchBlocked">
-		土地の検索がブロックされました。
-短期間に多くの土地を検索したためです。
-しばらくしてから再度お試しください。
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		オブジェクトの着用に使用できるスクリプトリソースが足りません。
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		死んでしまったので、ホームにテレポートされました。
-	</notification>
-	<notification name="EjectComingSoon">
-		ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。
-	</notification>
-	<notification name="NoEnterServerFull">
-		サーバーが埋まっているため、
-このリージョンに入場することはできません。
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		「「持ち物」に保存」が無効になっています。
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		&apos;[OBJ_NAME]&apos; の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		オブジェクト &apos;[DEST_NAME]&apos; を修正する権限がないため、オブジェクトのコンテンツに &apos;[OBJ_NAME]&apos; を保存できません。
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		インベントリに &apos;[OBJ_NAME]&apos; を保存することはできません - この操作が無効になっています。
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものをコピーできません。
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
-	</notification>
-	<notification name="NoTransNoCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		シミュレータからのオブジェクト &apos;[OBJ_NAME]&apos; の削除は、権限システムによって無効にされています。
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを保存できません。
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		オブジェクト &apos;[OBJ_NAME]&apos; をコピーできないため、選択したものを保存できません。
-	</notification>
-	<notification name="NoModNoTaking">
-		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを取得できません。
-	</notification>
-	<notification name="RezDestInternalError">
-		内部エラー: 不明な宛先タイプ。
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		オブジェクトが見つからないため削除できませんでした。
-	</notification>
-	<notification name="SorryCantEjectUser">
-		残念ながら、そのユーザーを追放することはできません。
-	</notification>
-	<notification name="RegionSezNotAHome">
-		このリージョンでは、ここにホームの位置を設定できません。
-	</notification>
-	<notification name="HomeLocationLimits">
-		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
-	</notification>
-	<notification name="HomePositionSet">
-		家の配置の設定。
-	</notification>
-	<notification name="AvatarEjected">
-		アバターが追放されました。
-	</notification>
-	<notification name="AvatarEjectFailed">
-		その区画の管理権限がないため、追放できませんでした。
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		区画が埋まっているため、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		オブジェクト &apos;[OBJECT_NAME]&apos; は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		この区画でこのオブジェクトのリソースが不足しているため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		不明な理由により、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		そのオブジェクトを変更する権限がありません
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		キーフレームオブジェクトのために物理を有効にできません。
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		土地のリソースが足りないため、オブジェクトの物理を有効にできません。
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
-	</notification>
-	<notification name="UnableAddItem">
-		アイテムを追加できません!
-	</notification>
-	<notification name="UnableEditItem">
-		これは編集できません!
-	</notification>
-	<notification name="NoPermToEdit">
-		これを編集する許可がありません。
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		そのインベントリをコピーすることは許可されません。
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		オブジェクトのコンテンツに保存できません。アイテムが存在していません。
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。
-	</notification>
-	<notification name="TooManyScripts">
-		スクリプトが多すぎます。
-	</notification>
-	<notification name="UnableAddScript">
-		テキストを追加できません!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		このリージョンでは、物理的シェイプが有効にされていません。
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		リージョンの境界をまたぐナビメッシュは変更できません。
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		そのオブジェクトタイプの物理的プロパティを設定できません。
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		ルートプリムを設定できないため、シェイプがありません。
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		このリージョンでは、物理的素材が有効にされていません。
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		物理的素材を調整できるのは、ルートプリムだけです。
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		キャラクターへの物理的素材の設定はまだサポートされていません。
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		指定した物理的素材のプロパティが 1 つ以上無効です。
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		メッシュオブジェクトの縫い目のタイプを変更することはできません。
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		メッシュオブジェクトの形状を変更することはできません
-	</notification>
-	<notification name="FullRegionCantEnter">
-		リージョンが埋まっているため、\nこのリージョンに入場できません。
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		リンクエラー -- 所有者が違います
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		リンクエラー -- 編集権限がありません。
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		リンクエラー -- プリミティブが多すぎます。
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		リンクエラー -- コピーなしと転送なしをリンクできません。
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		リンクエラー -- リンクできるものがありません。
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		リンクエラー -- パスファインディングの文字数が多すぎます
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		リンクエラー -- 土地のリソースが足りません
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはホームにテレポートされました。
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		​オブジェクト ​&apos;[OBJECT_NAME]&apos; によって、あなたはホームへテレポートされています。
-	</notification>
-	<notification name="TeleportedByAttachment">
-		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		[OWNER_ID] が所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		不明なユーザーが所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		1 つの場所に複数のオブジェクトを着用することはできません。
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		ここでは、複数のオブジェクトを作成することはできません。
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		要求されたオブジェクトを作成できません。もう一度お試しください。
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		この土地に木を植えることはできません。
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		オブジェクトをリストアできません。ワールドの位置が見つかりません。
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		メッシュデータが無効なため、オブジェクトを Rez することができません。
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		現在のアクセス権限では、そこにオブジェクトを作成できません。
-	</notification>
-	<notification name="CantCreateObject">
-		現在あなたにはオブジェクト作成する許可がありません。
-	</notification>
-	<notification name="InvalidObjectParams">
-		無効なオブジェクトパラメーター
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
-	</notification>
-	<notification name="CantChangeShape">
-		あなたにはこのシェイプを変更する許可がありません。
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		現在のアクセス権限では、ここにオブジェクトを取得できません。
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		現在のアクセス権限では、ここでオブジェクトを購入できません。
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		アバターがオブジェクトに存在するため、オブジェクトを着用できません。
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		木や草をアタッチメントとして着用できません。
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		グループが所有しているオブジェクトは着用できません。
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		所有していないオブジェクトは着用できません。
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		ナビメッシュに貢献しているオブジェクトは着用できません。
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		オブジェクトの着用に使用できるスクリプトリソースが足りません。
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		ここにオブジェクトをドロップできません。区画が埋まっています。
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		削除パラメーターを絞ってください。
-	</notification>
-	<notification name="UnableToUploadAsset">
-		資産をアップロードできません。
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		ホームをテレポートするユーザーが見つかりませんでした。
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		過剰なリクエストが失敗しました
-	</notification>
-	<notification name="GenericRequestFailed">
-		一般的なリクエストに失敗しました
-	</notification>
-	<notification name="CantUploadPostcard">
-		ポストカードをアップロードできません。後でもう一度お試しください。
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		グループ通知のインベントリの詳細を取得できません。
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		グループ通知の送信が許可されないため、送信できません。
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		グループ通知を送信できません。持ち物を作成することもできません。
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		通知内の持ち物を検出できません。
-	</notification>
-	<notification name="TerrainUploadFailed">
-		地形のアップロードに失敗しました。
-	</notification>
-	<notification name="TerrainFileWritten">
-		地形ファイルが書き込まれました。
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		地形ファイルを書き出し、ダウンロードを開始しています...
-	</notification>
-	<notification name="TerrainBaked">
-		地形がベークされました。
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		この区画を購入するには、ビューワをアップデートする必要があります。
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		購入することができません。この区画は販売対象ではありません。
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		販売価格または土地の面積が変わったため、購入できません。
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		あなたはこの区画の委任された買い手ではありません。
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		すでに購入の認証を待機しているため、この区画を購入できません。
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		選択範囲のリース区画の数が少ないため、参加できません。
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		土地を分解できません。\n区画が見つかりません。\n「Help」&gt;「Reprt Bug...」でレポートを行ってください。
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。
-	</notification>
-	<notification name="LandHasBeenDivided">
-		土地が分割されています。
-	</notification>
-	<notification name="PassPurchased">
-		入場許可を購入しました。
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		リージョンでは、クラシファイド広告を許可しません。
-	</notification>
-	<notification name="LandPassExpireSoon">
-		この土地への入場許可はまもなく期限が切れます。
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		配置に適した表面がありません。別の場所を試してみたください。
-	</notification>
-	<notification name="CantSitNoRoom">
-		ここには座る余地がありません。他の場所を試してください。
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		権限がないため、オブジェクトを取得できませんでした。
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		リンデンドルが足りないため、オブジェクトの取得に失敗しました。
-	</notification>
-	<notification name="CantDeedGroupLand">
-		グループ所有の土地は、譲渡できません。
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		リンデンドルが足りないため、オブジェクトの購入に失敗しました。
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		リンデンドルが不足しているため、インベントリを購入できませんでした。
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		リンデンドルが足りないため、この土地への入場許可を購入できません。
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		今すぐには入場許可を購入できません。後でもう一度お試しください。
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		区画が埋まっているため、オブジェクトを\n作成することができません。
-	</notification>
-	<notification name="FailedPlacingObject">
-		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		イベントのためのランドマークを作成することができません。
-	</notification>
-	<notification name="GodBeatsFreeze">
-		強力な力でフリーズを解除します。
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
-	</notification>
-	<notification name="ExpireExplanation">
-		システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
-	</notification>
-	<notification name="DieExplanation">
-		システムは、あなたのリクエストを処理できません。
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		プリミティブ広告を出すには、資金が足りません。
-	</notification>
-	<notification name="RezObjectFailure">
-		資金が足りないため、オブジェクトを作成できません。
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		ホームが不正なため、ホームの位置をリセットします。
-	</notification>
-	<notification name="CantInviteRegionFull">
-		リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		このリージョンでは、ここにホームの位置を設定できません。
-	</notification>
-	<notification name="ListValidHomeLocations">
-		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
-	</notification>
-	<notification name="SetHomePosition">
-		家の配置の設定。
-	</notification>
-	<notification name="CantDerezInventoryError">
-		インベントリエラーのため、オブジェクトの Rez 解除ができません。
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		リクエストされたインベントリを作成できません。
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		リクエストされた持ち物フォルダーを作成できません。
-	</notification>
-	<notification name="CantCreateInventory">
-		そのインベントリを作成できません。
-	</notification>
-	<notification name="CantCreateLandmark">
-		ランドマークを作成できません。
-	</notification>
-	<notification name="CantCreateOutfit">
-		アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
-	</notification>
-	<notification name="InventoryNotForSale">
-		インベントリは販売対象ではありません。
-	</notification>
-	<notification name="CantFindInvItem">
-		持ち物アイテムを見つけることができません。
-	</notification>
-	<notification name="CantFindObject">
-		オブジェクトが見つかりません。
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		オブジェクトへの送金は、このリージョンでは現在無効にされています。
-	</notification>
-	<notification name="CantPayNoAgent">
-		支払いの相手を把握できませんでした。
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		パブリックオブジェクトにリンデンドルを与えることはできません。
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		インワールドオブジェクトでのインベントリ作成に失敗しました。
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
-		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
-		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		ファイルを移動できません。以前のパスがリストアされました。
-		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 3ef8eba19f..70d37c3bad 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
 	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
 	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
-	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 9263e5f347..5d6a6065ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="フィルター" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
-		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
-		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
-		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
-	</panel>
-	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
+	<text name="title_text">
+		ブロックリスト
+	</text>
+	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
+	<button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
+	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
+	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
deleted file mode 100644
index 09ffb92d36..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="（ローディング）"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
deleted file mode 100644
index e05a67e31d..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
-	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
-	<button name="delete_btn" tool_tip="このエントリーを削除"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 77d3d8f391..4b548049c8 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="不明"/>
-	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 03ce87537a..88c31451b5 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人" name="people_panel">
 	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
 	</string>
+	<string name="people_filter_label" value="人をフィルター"/>
+	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
+	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
+				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
 			</panel>
 		</panel>
-		<panel label="フレンド" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人をフィルター" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
+		<panel label="マイ フレンド" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="グループ" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
-				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
+		<panel label="マイ グループ" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
+				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人をフィルター" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
+				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
 			</panel>
 		</panel>
-		<panel label="停止" name="blocked_panel">
-			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index ae5391c7bd..b6e344ca48 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<panel>
-		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			文字の大きさ：
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="小規模" name="Small" value="0"/>
-			<item label="中" name="Medium" value="1"/>
-			<item label="大規模" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			通知
-		</text>
-		<text name="friend_ims">
-			フレンド IM:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			非フレンド IM:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			コンファレンス IM:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			グループチャット:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="なし" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			近くのチャット:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			すべての通知を一時的に受け付けないようにするには、「コミュニケート」&gt;「通知を受けない」を使用します。
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			音の再生:
-		</text>
-		<check_box label="新しい会話" name="new_conversation"/>
-		<check_box label="ボイスコールの着信" name="incoming_voice_call"/>
-		<check_box label="テレポートを渡す" name="teleport_offer"/>
-		<check_box label="アイテムのオファー" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="ログのクリア..." name="clear_log"/>
-		<button label="テキストの削除..." name="delete_transcripts"/>
-		<button label="参照..." label_selected="参照" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		文字の大きさ：
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="小" name="radio" value="0"/>
+		<radio_item label="中" name="radio2" value="1"/>
+		<radio_item label="大" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
+	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		IM の表示方法：
+	</text>
+	<text name="requires_restart_label">
+		（再起動後に反映）
+	</text>
+	<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）">
+		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
+		<radio_item label="タブ" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		受信チャットのポップアップを有効にする
+	</text>
+	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
+	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
+	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
+	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
 	<button label="他の言語..." name="ok_btn"/>
 	<button label="自動置換..." name="autoreplace_showgui"/>
 	<button label="スペルチェック中..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index d70af7e099..91e1514e49 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="一時退席設定なし" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		「通知を受けない」応答:
+		取り込み中モード時の返事：
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index 4f65c8477b..c61c73657f 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
-			<combo_box.item label="ズーム" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index b27904c4d7..50697e5500 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=ja-JP&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
@@ -622,8 +622,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="AvatarAway">
 		一時退席中
 	</string>
-	<string name="AvatarDoNotDisturb">
-		通知を受けない
+	<string name="AvatarBusy">
+		取り込み中
 	</string>
 	<string name="AvatarMuted">
 		ブロック中
@@ -859,12 +859,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="ST_NO_JOINT">
 		ROOT または JOINT が見つかりません
 	</string>
-	<string name="NearbyChatTitle">
-		近くのチャット
-	</string>
-	<string name="NearbyChatLabel">
-		(近くのチャット)
-	</string>
 	<string name="whisper">
 		のささやき:
 	</string>
@@ -928,15 +922,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
-	<string name="NotConnected">
-		接続されていません
-	</string>
-	<string name="AgentNameSubst">
-		(あなた)
-	</string>
 	<string name="TeleportYourAgent">
 		あなたをテレポート
 	</string>
+	<string name="NotConnected">
+		接続されていません
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1018,6 +1009,18 @@ support@secondlife.com にお問い合わせください。
 	<string name="dictionary_files">
 		辞書
 	</string>
+	<string name="AvatarSetNotAway">
+		一時退席中解除
+	</string>
+	<string name="AvatarSetAway">
+		一時退席中
+	</string>
+	<string name="AvatarSetNotBusy">
+		取り込み中解除
+	</string>
+	<string name="AvatarSetBusy">
+		取り込み中
+	</string>
 	<string name="shape">
 		シェイプ
 	</string>
@@ -1986,8 +1989,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。
+	<string name="BusyModeResponseDefault">
+		メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。  あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
 	</string>
 	<string name="MuteByName">
 		（名称別）
@@ -2100,6 +2103,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDate">
 		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		内容
+	</string>
 	<string name="AcquiredItems">
 		取得アイテム
 	</string>
@@ -3871,7 +3877,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		General リージョン
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
+		この区画外にアバターを見えるようにして、チャットも許可
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
@@ -3948,12 +3954,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="IM_unblock_only_groups_friends">
 		このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。
 	</string>
-	<string name="OnlineStatus">
-		オンライン
-	</string>
-	<string name="OfflineStatus">
-		オフライン
-	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
@@ -3963,9 +3963,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="you_joined_call">
 		ボイスコールに参加しました
 	</string>
-	<string name="you_auto_rejected_call-im">
-		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
-	</string>
 	<string name="name_started_call">
 		[NAME] はボイスコールを開始します
 	</string>
@@ -3982,7 +3979,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		接続中...
 	</string>
 	<string name="conference-title">
-		複数人チャット
+		アドホックコンファレンス
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] とコンファレンスする
@@ -4862,9 +4859,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Label">
 		チャット
 	</string>
-	<string name="Command_Conversations_Label">
-		会話
-	</string>
 	<string name="Command_Compass_Label">
 		コンパス
 	</string>
@@ -4940,9 +4934,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Tooltip">
 		近くの人と文字チャットする
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		全員との会話
-	</string>
 	<string name="Command_Compass_Tooltip">
 		コンパス
 	</string>
@@ -5072,13 +5063,4 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
deleted file mode 100644
index ae7dd3c441..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
deleted file mode 100644
index 97a2e8327c..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSA:">
-	<floater.string name="Title">
-		CONVERSA: [NAME]
-	</floater.string>
-	<text name="page_label" value="Página"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index a1cea72b1e..0fbb826a96 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAS">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
-					<button name="add_btn" tool_tip="Iniciar uma nova conversa"/>
-					<button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Recolher este painel"/>
-					<text name="stub_textbox">
-						Esta conversa está em uma janela separada.   [secondlife:/// Trazer de volta.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSAS"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 9f6a7a06ad..5543ffa41d 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/>
-	<floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/>
-	<floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/>
-	<floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/>
-	<floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/>
-	<floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/>
-				<menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/>
-				<button name="voice_call_btn" tool_tip="Abrir conexão por voz"/>
-				<button name="close_btn" tool_tip="Encerrar esta conversa"/>
-				<button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Para" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="Para" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 1e86f847ad..6344258fa0 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz?
 	</floater.string>
 	<text name="question">
-		Se você atender, será desconectado de suas conversas de voz atuais.
+		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
 	</text>
-	<button label="Atender" label_selected="Atender" name="Accept"/>
-	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
-	<button label="Iniciar MI em vez disso" name="Start IM"/>
+	<button label="Aceitar" label_selected="Aceitar" name="Accept"/>
+	<button label="Rejeitar" label_selected="Rejeitar" name="Reject"/>
+	<button label="Enviar MI" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index d04cf2a173..182f2513e0 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Exibir:
 			</text>
-			<check_box label="Testar" name="show_world"/>
+			<check_box label="Mundo" name="show_world"/>
 			<check_box label="Apenas móveis" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index ba4ef0afde..a75cf34a94 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Visualização em tempo real" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Visualização desativada"/>
 	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
deleted file mode 100644
index de7aa2df12..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ">
-	<slider label="Bate-papo de voz" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index 71d3c33ae5..b29ca3d699 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
+<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ">
 	<string name="no_voice_effect">
 		(Não distorcer voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
deleted file mode 100644
index dae47a99ae..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUME DE VOZ">
-	<slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
index b59895573e..8716992a5e 100644
--- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Roupas novas" name="COF.Gear.New_Clothes"/>
-	<menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
deleted file mode 100644
index 01316b887d..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
-	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
-	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
-	<menu_item_call label="Exibir perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Chamada de voz" name="voice_call"/>
-	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Remover amigos" name="remove_friends"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Bloquear voz" name="block_unblock"/>
-	<menu_item_check label="Bloquear texto" name="MuteText"/>
-	<menu_item_call label="Perfil do grupo" name="group_profile"/>
-	<menu_item_call label="Ativar grupo" name="activate_group"/>
-	<menu_item_call label="Sair do grupo" name="leave_group"/>
-	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
-		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
-		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
-		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
deleted file mode 100644
index 616e6db46e..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="MI..." name="IM"/>
-	<menu_item_call label="Chamada de voz..." name="Call"/>
-	<menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/>
-	<menu_item_call label="Exibir perfil" name="View Profile"/>
-	<menu_item_call label="Oferecer teletransporte" name="teleport"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="Invite"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
deleted file mode 100644
index cab81175a0..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por data" name="sort_by_date"/>
-	<menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/>
-	<menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
deleted file mode 100644
index a8434dc336..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Exibir perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo" name="Add Friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
-	<menu_item_check label="Bloquear texto" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
deleted file mode 100644
index 398b890f66..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Exibição compacta" name="compact_view"/>
-	<menu_item_check label="Exibição expandida" name="expanded_view"/>
-	<menu_item_check label="Mostrar hora" name="IMShowTime"/>
-	<menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index df224a88fa..7af760a6ee 100644
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
 	<menu_item_call label="Bloquear..." name="Block"/>
-	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
-	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 3602bdaac4..894f1d741c 100644
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Novo cabelo" name="New Hair"/>
 		<menu_item_call label="Novos olhos" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Expandir todas as pastas" name="expand"/>
-	<menu_item_call label="Recolher todas as pastas" name="collapse"/>
 	<menu_item_call label="Renomear look" name="rename"/>
 	<menu_item_call label="Excluir visual" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
deleted file mode 100644
index b61108cf54..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/>
-	<menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/>
-	<menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/>
-	<menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/>
-	<menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/>
-	<menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/>
-	<menu_item_check label="Registro de conversas..." name="Conversation"/>
-	<menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/>
-	<menu_item_check label="Configurações de tradução..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
deleted file mode 100644
index 8bbde9b38c..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Desbloquear" name="unblock"/>
-	<menu_item_call label="Perfil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
deleted file mode 100644
index e69935995c..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/>
-	<menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
deleted file mode 100644
index b80d683c7b..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
deleted file mode 100644
index 46caeae310..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por status" name="sort_status"/>
-	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
-	<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
index 2ba7af17cd..9a924ad7b9 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver dados" name="View Info"/>
 	<menu_item_call label="Bate-papo" name="Chat"/>
-	<menu_item_call label="Chamada de voz" name="Call"/>
+	<menu_item_call label="Ligar" name="Call"/>
 	<menu_item_call label="Ativar" name="Activate"/>
 	<menu_item_call label="Sair" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
deleted file mode 100644
index 637e591ae1..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 51464fed68..7c720f262b 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Exibir perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Chamada de voz" name="voice_call"/>
-	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
+	<menu_item_call label="Ver perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+	<menu_item_call label="Teletransportar?" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 7f3c6ace27..79edb96b1c 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Adicionar amigo..." name="add_friends"/>
-	<menu_item_call label="Remover amigo..." name="remove_friends"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ligar" name="call"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_call label="Teletransportar?" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
deleted file mode 100644
index bce015e732..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
-	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Exibir mapa" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
deleted file mode 100644
index e4b368fe14..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index aa0a426405..ba5e055124 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Exibir perfil" name="show_agent"/>
-	<menu_item_call label="Enviar MI..." name="send_im"/>
-	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
+	<menu_item_call label="Mostrar perfil de residente" name="show_agent"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index 247a92567a..c197444181 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Perfil do objeto..." name="show_object"/>
+	<menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 703df84efb..ca378c1b58 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status"/>
+		<menu label="Status" name="Status">
+			<menu_item_call label="Ausente" name="Set Away"/>
+			<menu_item_call label="Ocupado" name="Set Busy"/>
+		</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="Painel da conta..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
-		<menu_item_check label="Conversas..." name="Conversations"/>
-		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
+		<menu_item_check label="Bate-papo..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
-		<menu label="Distorção de voz" name="VoiceMorphing">
-			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
-			<menu_item_check label="Visualizar..." name="Preview"/>
-			<menu_item_call label="Assinar..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Configurações de voz..." name="Nearby Voice"/>
+		<menu_item_check label="Distorção de voz..." name="ShowVoice"/>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_check label="Amigos" name="My Friends"/>
-		<menu_item_check label="Grupos" name="My Groups"/>
-		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_call label="Amigos" name="My Friends"/>
+		<menu_item_call label="Grupos" name="My Groups"/>
+		<menu_item_call label="Pessoas próximas" name="Active Speakers"/>
 		<menu_item_call label="Lista de bloqueados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Pegar" name="Menu Object Take"/>
 			<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
+			<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opções" name="Options">
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Como..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
-		<menu_item_call label="Guia do usuário" name="User’s guide"/>
-		<menu_item_call label="Base de conhecimento" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Fóruns da comunidade" name="Community Forums"/>
-		<menu_item_call label="Portal de suporte" name="Support portal"/>
-		<menu_item_call label="Notícias do [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
@@ -344,14 +336,9 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Velocidade de animação" name="Animation Speed">
-				<menu_item_call label="Todas as animações 10% mais rápidas" name="All Animations 10 Faster"/>
-				<menu_item_call label="Todas as animações 10% mais lentas" name="All Animations 10 Slower"/>
-				<menu_item_call label="Redefinir todas as velocidades de animação" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animações em câmera lenta" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Dados da animação" name="Animation Info"/>
+			<menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/>
 			<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="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index d9f5e48745..ff7382bf80 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -510,24 +510,6 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
-
-    Visitar [_URL] para verificar se há atualizações do driver?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
-
-    Visitar [_URL] para verificar se há atualizações do driver?
-		<url name="url">
-			http://www.nvidia.com.br/Download/index.aspx?lang=br
-		</url>
-		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
-	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -1551,13 +1533,10 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Não perturbe está ativado.  Você não será notificado de comunicações recebidas.
-
-- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências &gt; Geral).
-- As ofertas de teletransporte serão recusadas.
-- Chamadas de voz serão recusadas.
-		<usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Modo ocupado ativado. 
+O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua resposta de modo ocupado.  Todas as ofertas de teletransporte serão recusadas.  Todas as ofertas de inventário serão colocadas na Lixeira.
+		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
@@ -2043,10 +2022,6 @@ Mover para o inventário o(s) item(s)?
 		Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta?
 		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada.  Todos os participantes recebem notificações sobre a nova conversa.
-		<usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Tem certeza que deseja sair?
 		<usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/>
@@ -2121,14 +2096,14 @@ Você deseja substituí-lo pelo objeto selecionado?
 			<button ignore="Never Replace" name="No" text="Não"/>
 		</form>
 	</notification>
-	<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
-		Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
+	<notification label="Aviso de Modo Ocupado" name="BusyModePay">
+		Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento.
 
-Deseja desativar o Não perturbe antes de concluir esta transação?
+Você gostaria de deixar o modo Ocupado antes de completar esta transação?
 		<form name="form">
-			<ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/>
-			<button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/>
-			<button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/>
+			<ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/>
+			<button ignore="Always leave Busy Mode" name="Yes" text="Sim"/>
+			<button ignore="Never leave Busy Mode" name="No" text="Não"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2263,8 +2238,11 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 	<notification name="GroupNotice">
 		Assunto: [SUBJECT], Mensagem: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está online
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está offline
 	</notification>
 	<notification name="AddSelfFriend">
 		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
@@ -2489,6 +2467,13 @@ Logo, não é possível voar aqui.
 	<notification name="DynamicPathfindingDisabled">
 		O pathfinding dinâmico não está habilitado nesta região.  Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento.  Para fazer com que os objetos em movimento se comportem corretamente, clique no botão “Recarregar região”.  Escolha “Ajuda” para obter mais informações.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Ajuda" ignoretext="A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Erro.  Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção.  Às vezes, fazer login e logout novamente resolve este problema.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2736,7 @@ OK?
 	<notification name="ScriptQuestionCaution">
 		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
   
-Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
+Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
 			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
@@ -3325,633 +3310,4 @@ Tentativa cancelada.
 		Você está excluindo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
 		<usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar congelado.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] descongelou você.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar descongelado.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		O congelamento falhou porque você não tem permissão de administrador para esse lote.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Seu congelamento expirou, vá cuidar da sua vida.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Não é possível congelar esse usuário.
-	</notification>
-	<notification name="NowOwnObject">
-		Agora você é o proprietário do objeto [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite.  Use a ferramenta de terrenos para ver a propriedade do terreno.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		O objeto não pode ser renderizado porque há muitas solicitações.
-	</notification>
-	<notification name="SitFailCantMove">
-		Você não pode sentar porque não pode se mover no momento.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Você não pode sentar porque não está autorizado a sentar nesse terreno.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Tente chegar mais perto.  Não é possível sentar no objeto porque
-ele não está na mesma região que você.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Não foi possível criar um novo objeto. A região está cheia.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Falha ao posicionar objeto em local específico.  Tente novamente.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Você não pode criar árvores e grama em terrenos que não são sua propriedade.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		A cópia falhou porque você não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; não pode ser transferido para você.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; contribui para o navmesh.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Duplicar sem objetos raiz selecionados.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Não é possível duplicar objetos porque a região está cheia.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Não é possível criar objeto porque 
-o lote está cheio.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Falha na tentativa de renderizar um objeto.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Não é possível criar um item que causou problemas a essa região.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Esse item do inventário foi incluído na lista.
-	</notification>
-	<notification name="NoCanRezObjects">
-		No momento, você não está autorizado a criar objetos.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Pesquisa de terreno bloqueada.
-Você realizou muitas pesquisas de terreno muito rápido.
-Tente novamente em instantes.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Não há recursos de script disponíveis suficientes para anexar objeto!
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Você morreu e foi teletransportado para seu início
-	</notification>
-	<notification name="EjectComingSoon">
-		Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Você não pode entrar nesta região porque 
-o servidor está cheio.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Salvar no inventário foi desativado.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque você não tem permissão para modificar o objeto &apos;[DEST_NAME]&apos;.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Não é possível salvar &apos;[OBJ_NAME]&apos; no inventário -- essa operação foi desativada.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Você não pode copiar sua seleção porque não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		A remoção do objeto &apos;[OBJ_NAME]&apos; do simulador é proibida pelo sistema de permissões.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Você não pode salvar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Não é possível salvar sua seleção porque o objeto &apos;[OBJ_NAME]&apos; não é copiável.
-	</notification>
-	<notification name="NoModNoTaking">
-		Você não pode levar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="RezDestInternalError">
-		Erro interno: tipo de destino desconhecido.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		A exclusão falhou porque o objeto não foi encontrado
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Não é possível expulsar esse usuário.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Esta região não permite que você a defina como seu início.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
-	</notification>
-	<notification name="HomePositionSet">
-		Posição de início definida.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar expulso.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		A expulsão falhou porque você não tem permissão de administrador para esse lote.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Você não está autorizado a modificar este objeto
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Não é possível ativar propriedades físicas para objetos keyframe.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh.
-	</notification>
-	<notification name="UnableAddItem">
-		Não é possível adicionar item!
-	</notification>
-	<notification name="UnableEditItem">
-		Não é possível editar isso!
-	</notification>
-	<notification name="NoPermToEdit">
-		Não é permitido editar isso.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Não é permitido copiar esse inventário.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Não é possível salvar no conteúdo do objeto: O item não existe mais.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
-	</notification>
-	<notification name="TooManyScripts">
-		Muitos scripts.
-	</notification>
-	<notification name="UnableAddScript">
-		Não é possível adicionar script!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Servidor de objetos não respondeu a tempo.  Objeto retornado a sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Esta região não tem formas físicas ativadas.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Você não pode modificar o navmesh além dos limites da região.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Não é possível definir as propriedades físicas neste tipo de objeto.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Não é possível definir que um prim raiz não tenha forma.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Esta região não tem materiais físicos ativados.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Apenas prims raiz podem ter seus materiais físicos ajustados.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Ainda não há suporte para a configuração dos materiais físicos em personagens.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Uma ou mais das propriedades do material físico são inválidas.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Você não pode alterar o tipo de acabamento de um objeto mesh.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Você não pode alterar a forma de um objeto mesh
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Você não pode entrar nesta região porque \nela está cheia.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Falha na vinculação -- proprietários diferentes
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Falha na vinculação -- não é possível modificar o navmesh além dos limites da região.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Ocorreu uma falha na vinculação porque você não tem permissão de edição.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Falha na vinculação -- muitos prims
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Falha na vinculação -- nada é vinculável.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Falha na vinculação -- muitos personagens com pathfinding
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Falha na vinculação -- recursos de terreno insuficientes
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		O objeto usa muitos recursos físicos – sua dinâmica foi desativada.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Você foi teletransportado por um anexo em [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de um usuário desconhecido.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Não foi possível criar o objeto solicitado. A região está cheia.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Não é possível anexar vários objetos a um local.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Você não pode criar vários objetos aqui.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Não foi possível criar o objeto solicitado. Tente novamente.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Falha na renderização, objeto solicitado demorou muito a carregar.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Falha ao posicionar objeto em local específico.  Tente novamente.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Você não pode criar plantas neste terreno.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Não é possível renderizar o objeto porque os dados de mesh são inválidos.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Não foi possível renderizar objeto porque já há muitos scripts nesta região.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Seus privilégios de acesso não permitem que você crie objetos aqui.
-	</notification>
-	<notification name="CantCreateObject">
-		No momento, você não está autorizado a criar objetos.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Parâmetros de objeto inválidos
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Seus privilégios de acesso não permitem que você duplique objetos aqui.
-	</notification>
-	<notification name="CantChangeShape">
-		Você não está autorizado a alterar essa forma.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Seus privilégios de acesso não permitem que você reivindique objetos aqui.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		A doação falhou porque você não está autorizado a doar objetos ao seu grupo.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Seus privilégios de acesso não permitem que você compre objetos aqui.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Não é possível anexar objeto porque um avatar está sentado nele.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Árvores e grama não podem ser usadas como anexos.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Não é possível anexar objetos de propriedade de um grupo.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Não é possível anexar objetos que não sua propriedade.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Não é possível anexar objetos que contribuem com o navmesh.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Não é possível vincular objeto porque você não tem permissão para movê-lo.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Não há recursos de script disponíveis suficientes para anexar objeto!
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Falha ao largar anexo: você não está autorizado a largá-lo aqui.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Falha ao largar anexo: recursos de terreno disponíveis insuficientes.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Falha ao largar anexos: recursos disponíveis insuficientes.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Não é possível largar objeto aqui.  O lote está cheio.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Detalhe seus parâmetros de exclusão.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Não é possível carregar objeto.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Não foi possível encontrar usuário para teletransportar para início
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		solicitação de poderes de deus falhou
-	</notification>
-	<notification name="GenericRequestFailed">
-		falha em solicitação genérica
-	</notification>
-	<notification name="CantUploadPostcard">
-		Não foi possível carregar cartão postal.  Tente novamente mais tarde.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Não foi possível obter detalhes de inventário para o anúncio de grupo.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Não é possível enviar anúncio de grupo -- não permitido.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Não é possível enviar anúncio de grupo -- não foi possível construir inventário.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Não é possível processar o inventário do anúncio.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Falha no envio de terreno.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Arquivo de terreno gravado.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Arquivo de terreno criado, iniciando o download...
-	</notification>
-	<notification name="TerrainBaked">
-		Terreno confeccionado.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Você precisa atualizar seu visualizador para comprar este lote.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Não é possível comprar, este lote não está à venda.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Não é possível comprar, o preço de venda ou a área do terreno foram alterados.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Você não é o comprador autorizado deste lote.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Você não pode comprar este lote porque já está aguardando aut. de compra
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Não é possível criar objeto aqui porque isso sobrecarregaria o lote.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Não há lotes alugados suficientes na seleção para reunir.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -&gt; Relatar bug...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		O terreno foi dividido.
-	</notification>
-	<notification name="PassPurchased">
-		Você comprou um passe.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		A região não permite classificados.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Seu passe para este terreno está prestes a expirar.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Não há uma superfície adequada para sentar, tente outro local.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Não há espaço para sentar aqui, tente outro local.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		A reivindicação do objeto falhou porque você não tem permissão
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		A reivindicação do objeto falhou porque você não tem L$ suficiente.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Não é possível doar terrenos de propriedade de um grupo.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		A compra do objeto falhou porque você não tem L$ suficientes.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		A compra do inventário falhou porque você não tem L$ suficiente
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Você não tem L $ suficientes para comprar um passe para este terreno.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Não é possível comprar passe no momento.  Tente novamente mais tarde.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Não é possível criar objeto porque \no lote está cheio.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Falha ao posicionar objeto em local específico.  Tente novamente.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Não é possível criar marco para o evento.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Seus poderes de deus rompem o congelamento!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Falha na solicitação de poderes especiais. Essa solicitação foi registrada.
-	</notification>
-	<notification name="ExpireExplanation">
-		O sistema não pode processar sua solicitação no momento. A solicitação expirou.
-	</notification>
-	<notification name="DieExplanation">
-		O sistema não pode processar sua solicitação.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Fundos insuficientes para criar prim.
-	</notification>
-	<notification name="RezObjectFailure">
-		Fundos insuficientes para criar objeto.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Redefinir Início pois o Início não era legal.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Esta região não permite que você a defina como seu início.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
-	</notification>
-	<notification name="SetHomePosition">
-		Posição de início definida.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Não é possível desrenderizar objeto devido a uma falha de inventário.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Não é possível criar o inventário solicitado.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Não é possível criar a pasta de inventário solicitada.
-	</notification>
-	<notification name="CantCreateInventory">
-		Não é possível criar esse inventário.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Não é possível criar marco.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Não é possível criar roupa agora. Tente novamente em instantes.
-	</notification>
-	<notification name="InventoryNotForSale">
-		O inventário não está à venda.
-	</notification>
-	<notification name="CantFindInvItem">
-		Não é possível encontrar item do inventário.
-	</notification>
-	<notification name="CantFindObject">
-		Não foi possível encontrar objeto.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Transferências de dinheiro para objetos estão desativadas para esta região no momento.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Não foi possível descobrir a quem pagar.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Não é possível dar L$ a objetos públicos.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Falha na criação de inventário de objetos do mundo virtual.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Um erro interno impediu que seu visualizador fosse atualizado corretamente.  O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Não é possível criar grandes prims que interceptam outros jogadores.  Tente novamente quando os outros jogadores tiverem se movido.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo.
-		<usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos.
-		<usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Não foi possível mover arquivos. Caminho anterior restaurado.
-		<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index 22eb23ebc5..b444593af8 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -26,6 +26,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/>
-	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
index 2fcf6b9932..c5f93d719a 100644
--- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtrar" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/>
-		<menu_button name="view_btn" tool_tip="Opções de ordenação"/>
-		<menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/>
-		<button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
+	<text name="title_text">
+		Lista de bloqueados
+	</text>
+	<scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
+	<button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/>
+	<button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/>
+	<button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
deleted file mode 100644
index f56168c962..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(carregando)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
deleted file mode 100644
index 74daded58f..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/>
-	<icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/>
-	<button name="delete_btn" tool_tip="Remover esta entrada"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index 0490878507..19c34d2f10 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
-	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index babb48c208..f3af15b991 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -14,53 +14,81 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_filtered_friends_msg">
 		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
+	<string name="people_filter_label" value="Filtro de pessoas"/>
+	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
+	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtrar pessoas" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opções"/>
+				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="AMIGOS" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtrar pessoas" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/>
-				<dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
-			</panel>
+		<panel label="MEUS AMIGOS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtrar grupos" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/>
-				<menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
-				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
+		<panel label="MEUS GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Opções"/>
+				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
+				<button name="activate_btn" tool_tip="Ativar o grupo selecionado"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtrar pessoas" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
-				<dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Opções"/>
+				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="BLOQUEADA" name="blocked_panel">
-			<panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index baf14c2c23..350d53b81c 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-		<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
-		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Tamanho da fonte:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Pequeno" name="Small" value="0"/>
-			<item label="Médio" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notificações
-		</text>
-		<text name="friend_ims">
-			MIs de amigos:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			MIs de não amigos:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			MIs de conferências:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Bate-papo de grupo:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Bate-papo local:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Executar som:
-		</text>
-		<check_box label="Nova conversa" name="new_conversation"/>
-		<check_box label="Chamada de voz recebida" name="incoming_voice_call"/>
-		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
-		<check_box label="Oferta de inventário" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Limpar registro..." name="clear_log"/>
-		<button label="Excluir transcrições..." name="delete_transcripts"/>
-		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Tamanho da fonte:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Pequeno" name="radio" value="0"/>
+		<radio_item label="Médio" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
+	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Mostrar MIs em:
+	</text>
+	<text name="requires_restart_label">
+		(Reinicie para ativar)
+	</text>
+	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
+		<radio_item label="Janelas separadas" name="radio" value="0"/>
+		<radio_item label="Guias" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Ativar pop-ups de novos bate-papos:
+	</text>
+	<check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/>
+	<check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/>
+	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/>
+	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
 	<button label="Tradução..." name="ok_btn"/>
 	<button label="Substituição automática..." name="autoreplace_showgui"/>
 	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 8a0495f9bb..c53aa7d5f7 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -69,9 +69,6 @@
 		<combo_box.item label="(nunca)" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Resposta de Não perturbe:
+		Mensagem do modo ocupado:
 	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index f0fd438cef..3cfe0fe4f4 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Comprar objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
-			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 4bf18aab70..bc72b86020 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=pt-BR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -571,8 +571,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AvatarAway">
 		Distante
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Não perturbe
+	<string name="AvatarBusy">
+		Ocupado
 	</string>
 	<string name="AvatarMuted">
 		Mudo
@@ -808,12 +808,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ST_NO_JOINT">
 		Não é possível encontrar a raiz (ROOT) ou junção (JOINT).
 	</string>
-	<string name="NearbyChatTitle">
-		Bate-papo local
-	</string>
-	<string name="NearbyChatLabel">
-		(Bate-papo local)
-	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -877,9 +871,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
-	<string name="AgentNameSubst">
-		(Você)
-	</string>
 	<string name="TeleportYourAgent">
 		Teletransportá-lo
 	</string>
@@ -964,6 +955,18 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="dictionary_files">
 		Dicionários
 	</string>
+	<string name="AvatarSetNotAway">
+		deixar como ausente
+	</string>
+	<string name="AvatarSetAway">
+		deixar como ausente
+	</string>
+	<string name="AvatarSetNotBusy">
+		deixar como não ocupado
+	</string>
+	<string name="AvatarSetBusy">
+		Deixar como ocupado
+	</string>
 	<string name="shape">
 		Silhueta
 	</string>
@@ -1920,8 +1923,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="PanelContentsNewScript">
 		Novo Script
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Este residente ativou o &quot;Não perturbe&quot; e verá sua mensagem mais tarde.
+	<string name="BusyModeResponseDefault">
+		O residente para o qual escreveu está no modo &apos;ocupado&apos;, ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
 	</string>
 	<string name="MuteByName">
 		(por nome)
@@ -2034,6 +2037,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Conteúdo
+	</string>
 	<string name="AcquiredItems">
 		Itens adquiridos
 	</string>
@@ -3747,7 +3753,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Região em geral
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele
+		Avatar visíveis e bate-papo permitido fora deste terreno
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada.
@@ -3824,12 +3830,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Para visualizar esta mensagem, você deve desmarcar &quot;Apenas amigos e grupos podem me ligar ou enviar MIs&quot; em Preferências/Privacidade.
 	</string>
-	<string name="OnlineStatus">
-		Conectado
-	</string>
-	<string name="OfflineStatus">
-		Desconectado
-	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
@@ -3839,9 +3839,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Você entrou na ligação
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Você recusou automaticamente a chamada de voz enquanto &quot;Não perturbe&quot; estava ativado.
-	</string>
 	<string name="name_started_call">
 		[NAME] iniciou uma ligação de voz
 	</string>
@@ -3854,9 +3851,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Saiu da ligação de voz
 	</string>
-	<string name="conference-title">
-		Bate-papo com várias pessoas
-	</string>
 	<string name="conference-title-incoming">
 		Conversa com [AGENT_NAME]
 	</string>
@@ -4732,9 +4726,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Label">
 		Bate-papo
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversas
-	</string>
 	<string name="Command_Compass_Label">
 		Bússola
 	</string>
@@ -4810,9 +4801,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Tooltip">
 		Bater papo com pessoas próximas usando texto
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Conversar com todos
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Bússola
 	</string>
@@ -4942,13 +4930,4 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="UserDictionary">
 		[Usuário]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
deleted file mode 100644
index 090ac7193a..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА">
-	<panel name="buttons_panel">
-		<filter_editor label="Фильтр для людей" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
deleted file mode 100644
index 23225fcf56..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="РАЗГОВОР:">
-	<floater.string name="Title">
-		РАЗГОВОР: [NAME]
-	</floater.string>
-	<text name="page_label" value="Страница"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
index eba7a19cd4..b147cfa2b3 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ОБЩЕНИЕ">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/>
-					<button name="add_btn" tool_tip="Начать разговор"/>
-					<button name="speak_btn" tool_tip="Разговаривать через микрофон"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/>
-					<text name="stub_textbox">
-						Разговор отображается в отдельном окне.   [secondlife:/// Вернуть.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index ea110ffb44..604d9dc6d3 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/>
-	<floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/>
-	<floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/>
-	<floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/>
-	<floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/>
-	<floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<button name="add_btn" tool_tip="Добавить участника в этот разговор"/>
-				<button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/>
-				<button name="close_btn" tool_tip="Завершить этот разговор"/>
-				<button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Переводить чат" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Кому" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="Кому" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
index 3f61421d0c..072c20147d 100644
--- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		анонимно
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		вызывает вас.
+		вызывает.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		теперь участвует в групповом голосовом чате.
@@ -25,9 +25,9 @@
 		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</floater.string>
 	<text name="question">
-		Если вы ответите, вы покинете текущий голосовой чат.
+		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</text>
-	<button label="Ответить" label_selected="Ответить" name="Accept"/>
-	<button label="Игнорировать" label_selected="Игнорировать" name="Reject"/>
-	<button label="Открыть IM" name="Start IM"/>
+	<button label="Принять" label_selected="Принять" name="Accept"/>
+	<button label="Отклонить" label_selected="Отклонить" name="Reject"/>
+	<button label="Начать IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index 8faddb1805..fa72df04fd 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Показать:
 			</text>
-			<check_box label="Тест" name="show_world"/>
+			<check_box label="Мир" name="show_world"/>
 			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
 			<check_box label="Навигационная сетка" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index a9a21e7d4a..db37089aeb 100644
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
-	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
+	<check_box initial_value="истина" label="Просмотр вживую" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
deleted file mode 100644
index 5a7e7a7061..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА">
-	<slider label="Голосовой чат" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
index d3cef042a3..1eb8a94d7a 100644
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
+<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА">
 	<string name="no_voice_effect">
 		(Нет изменения голоса)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
deleted file mode 100644
index aca6bd518a..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА">
-	<slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
index b7a32dfd75..0332c03a04 100644
--- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Новая одежда" name="COF.Gear.New_Clothes"/>
-	<menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/>
+	<menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
deleted file mode 100644
index 530b1ea704..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
-	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
-	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
-	<menu_item_call label="Смотреть профиль" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
-	<menu_item_call label="Голосовой вызов" name="voice_call"/>
-	<menu_item_call label="Журнал чата..." name="chat_history"/>
-	<menu_item_call label="Добавить друга" name="add_friend"/>
-	<menu_item_call label="Удалить друга" name="remove_friend"/>
-	<menu_item_call label="Удалить друзей" name="remove_friends"/>
-	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Карта" name="map"/>
-	<menu_item_call label="Поделиться" name="share"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_check label="Блокировать голос" name="block_unblock"/>
-	<menu_item_check label="Блокировать текст" name="MuteText"/>
-	<menu_item_call label="Профиль группы" name="group_profile"/>
-	<menu_item_call label="Активировать группу" name="activate_group"/>
-	<menu_item_call label="Покинуть группу" name="leave_group"/>
-	<context_menu label="Параметры модератора" name="Moderator Options">
-		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
-		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/>
-		<menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
deleted file mode 100644
index 3fbffbe038..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Голосовой вызов..." name="Call"/>
-	<menu_item_call label="Открыть журнал чата..." name="Chat history"/>
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
-	<menu_item_call label="Добавить друга" name="add_friend"/>
-	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
-	<menu_item_call label="Пригласить в группу..." name="Invite"/>
-	<menu_item_call label="Карта" name="Map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Черный список" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
deleted file mode 100644
index 928146e273..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
-	<menu_item_check label="Сортировать по дате" name="sort_by_date"/>
-	<menu_item_check label="Сначала друзья" name="sort_by_friends"/>
-	<menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
deleted file mode 100644
index 1db0b8bae3..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="Добавить друга" name="Add Friend"/>
-	<menu_item_call label="Удалить друга" name="remove_friend"/>
-	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
-	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
-	<menu_item_call label="Журнал чата..." name="chat_history"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Карта" name="map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Блокировать голос" name="Block/Unblock"/>
-	<menu_item_check label="Блокировать текст" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
deleted file mode 100644
index 35cff8e4bf..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Компактный вид" name="compact_view"/>
-	<menu_item_check label="Развернутый вид" name="expanded_view"/>
-	<menu_item_check label="Показать время" name="IMShowTime"/>
-	<menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 0c50abcfbd..6229b2e72f 100644
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Профиль объекта..." name="Object Profile"/>
 	<menu_item_call label="Блокировать..." name="Block"/>
-	<menu_item_call label="Показать на карте" name="show_on_map"/>
-	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index d379a17216..93dbd7d6a7 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Новые волосы" name="New Hair"/>
 		<menu_item_call label="Новые глаза" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Открыть все папки" name="expand"/>
-	<menu_item_call label="Закрыть все папки" name="collapse"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
 	<menu_item_call label="Удалить костюм" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
deleted file mode 100644
index 851a42d428..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/>
-	<menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/>
-	<menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/>
-	<menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/>
-	<menu_item_call label="Изменить настройки..." name="chat_preferences"/>
-	<menu_item_call label="Настройки приватности..." name="privacy_preferences"/>
-	<menu_item_check label="Журнал разговора..." name="Conversation"/>
-	<menu_item_check label="Перевести локальный чат" name="Translate_chat"/>
-	<menu_item_check label="Настройки перевода..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
deleted file mode 100644
index 157f2ad5e2..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Разблокировать" name="unblock"/>
-	<menu_item_call label="Профиль…" name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
deleted file mode 100644
index f42e8f8609..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/>
-	<menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
deleted file mode 100644
index 8c0150e8ae..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
-	<menu_item_check label="Сортировать по типу" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
deleted file mode 100644
index 7b2dba0539..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
-	<menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
index 78d73c9d1e..e734a83ef0 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Информация" name="View Info"/>
 	<menu_item_call label="Чат" name="Chat"/>
-	<menu_item_call label="Голосовой вызов" name="Call"/>
+	<menu_item_call label="Звонок" name="Call"/>
 	<menu_item_call label="Активация" name="Activate"/>
 	<menu_item_call label="Покинуть" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
deleted file mode 100644
index cbf1c64774..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index d05b7e7d01..ebce959044 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Смотреть профиль" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
-	<menu_item_call label="Голосовой вызов" name="voice_call"/>
-	<menu_item_call label="Посмотреть журнал чата..." name="chat_history"/>
-	<menu_item_call label="Добавить друга" name="add_friend"/>
-	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
-	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Карта" name="map"/>
-	<menu_item_call label="Поделиться" name="share"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_check label="Черный список" name="block_unblock"/>
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="В друзья" name="Add Friend"/>
+	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Карта" name="Map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Черный список" name="Block/Unblock"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
index 88eb56c9f5..0e8e0d4053 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Добавить в друзья" name="add_friends"/>
-	<menu_item_call label="Удалить из друзей" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Звонок" name="call"/>
-	<menu_item_call label="Поделиться" name="share"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
+	<menu_item_call label="Добавить в друзья" name="Add Friends"/>
+	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
deleted file mode 100644
index 2bc353ad58..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-	<menu_item_check label="Смотреть карту" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
deleted file mode 100644
index a009cf081f..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по времени" name="sort_most"/>
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 230d049fad..0ba3ee152a 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Смотреть профиль" name="show_agent"/>
-	<menu_item_call label="Отправить сообщение..." name="send_im"/>
-	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
+	<menu_item_call label="Показать профиль жителя" name="show_agent"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 1326db708e..6e7800d3f5 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Профиль объекта..." name="show_object"/>
+	<menu_item_call label="Показать информацию об объекте" name="show_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d6625361c5..d9425937c3 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Статус" name="Status"/>
+		<menu label="Статус" name="Status">
+			<menu_item_call label="Нет на месте" name="Set Away"/>
+			<menu_item_call label="Не беспокоить" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
 		<menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/>
@@ -27,18 +30,14 @@
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
-		<menu_item_check label="Разговоры..." name="Conversations"/>
-		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
+		<menu_item_check label="Чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
-		<menu label="Изменение голоса" name="VoiceMorphing">
-			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
-			<menu_item_check label="Просмотр..." name="Preview"/>
-			<menu_item_call label="Подписаться..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Настройки голоса..." name="Nearby Voice"/>
+		<menu_item_check label="Изменение голоса..." name="ShowVoice"/>
 		<menu_item_check label="Жесты..." name="Gestures"/>
-		<menu_item_check label="Друзья" name="My Friends"/>
-		<menu_item_check label="Группы" name="My Groups"/>
-		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_call label="Друзья" name="My Friends"/>
+		<menu_item_call label="Группы" name="My Groups"/>
+		<menu_item_call label="Люди неподалеку" name="Active Speakers"/>
 		<menu_item_call label="Черный список" name="Block List"/>
 	</menu>
 	<menu label="Мир" name="World">
@@ -114,6 +113,7 @@
 			<menu_item_call label="Купить" name="Menu Object Buy"/>
 			<menu_item_call label="Взять" name="Menu Object Take"/>
 			<menu_item_call label="Взять копию" name="Take Copy"/>
+			<menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
 		</menu>
@@ -128,7 +128,6 @@
 			<menu_item_call label="Наборы связей..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Персонажи..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Просмотр/тестирование..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Восстановить регион" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Параметры" name="Options">
 			<menu_item_check label="Показать расширенные разрешения" name="DebugPermissions"/>
@@ -158,13 +157,6 @@
 	<menu label="Справка" name="Help">
 		<menu_item_call label="Инструкции..." name="How To"/>
 		<menu_item_call label="Справка по [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Руководство пользователя" name="User’s guide"/>
-		<menu_item_call label="База знаний" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Форумы сообщества" name="Community Forums"/>
-		<menu_item_call label="Портал поддержки" name="Support portal"/>
-		<menu_item_call label="Новости [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Жалоба" name="Report Abuse"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
@@ -391,14 +383,9 @@
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Скорость анимации" name="Animation Speed">
-				<menu_item_call label="Ускорить все анимации на 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="Замедлить все анимации на 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="Восстановить скорость анимаций" name="Reset All Animation Speed"/>
-				<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
+			<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
 			<menu_item_check label="Показать указание" name="Show Point At"/>
 			<menu_item_check label="Отладка обновленных движений суставов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 00ab0b5763..85b7074253 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -516,24 +516,6 @@
 		</url>
 		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
-
-    Проверить наличие обновления для драйвера по адресу [_URL]?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
-
-    Проверить наличие обновления для драйвера по адресу [_URL]?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=ru-ru
-		</url>
-		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
-	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -1564,13 +1546,10 @@ http://secondlife.com/download.
 		Сейчас невозможно предложить дружбу. Повторите попытку через минуту.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Режим «Не беспокоить» включен.  Вы не будете получать уведомлений о входящих вызовах.
-
-- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки &gt; Общие).
-- Предложения телепортации будут отклоняться.
-- Голосовые вызовы будут отклоняться.
-		<usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Установлен режим «Занят».
+Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину.
+		<usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение.
@@ -2054,10 +2033,6 @@ http://secondlife.com/download.
 		Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта?
 		<usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		При добавлении участника в существующий разговор будет создан новый разговор.  Все участники получат уведомления о новом разговоре.
-		<usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Выйти из программы?
 		<usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/>
@@ -2132,14 +2107,14 @@ http://secondlife.com/download.
 			<button ignore="Не заменять" name="No" text="Отмена"/>
 		</form>
 	</notification>
-	<notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay">
-		Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж.
+	<notification label="Предупреждение о режиме «Занят»" name="BusyModePay">
+		У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж.
 
-Отключить режим «Не беспокоить» перед завершением этой операции?
+Хотите отключить режим «Занят» до завершения этой транзакции?
 		<form name="form">
-			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/>
-			<button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/>
-			<button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/>
+			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/>
+			<button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/>
+			<button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2274,8 +2249,11 @@ http://secondlife.com/download.
 	<notification name="GroupNotice">
 		Раздел: [SUBJECT], сообщение: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; в сети
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; не в сети
 	</notification>
 	<notification name="AddSelfFriend">
 		Вы лучше всех, но нельзя добавить в друзья себя самого.
@@ -2504,6 +2482,13 @@ http://secondlife.com/download.
 	<notification name="DynamicPathfindingDisabled">
 		В этом регионе не разрешен динамический поиск пути.  Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов.  Чтобы исправить их поведение, нажмите кнопку «Восстановить регион».  Более подробная информация – по ссылке «Справка».
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Справка" ignoretext="Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Произошла ошибка.  Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство.  Иногда для устранения этой проблемы достаточно выйти и снова войти.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2766,7 +2751,7 @@ http://secondlife.com/download.
 	<notification name="ScriptQuestionCaution">
 		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
   
-Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
+Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
 			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
@@ -3348,632 +3333,4 @@ http://secondlife.com/download.
 		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
 		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Аватар заморожен.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] разморозил вас.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Аватар разморожен.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Не удалось заморозить: у вас нет прав администратора на этом участке.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Заморозка кончилась, занимайтесь своим делом.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Невозможно заморозить этого пользователя.
-	</notification>
-	<notification name="NowOwnObject">
-		Вы стали владельцем объекта [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли.  Узнать, кто владелец, можно с помощью инструмента «Земля».
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Невозможно выложить объект: слишком много запросов.
-	</notification>
-	<notification name="SitFailCantMove">
-		Нельзя сесть: сейчас вы не можете двигаться.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Вам не разрешено садиться на этой земле.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Попробуйте переместиться ближе.  Нельзя сесть на объект:
-он находится в другом регионе.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Невозможно создать новый объект. Регион уже заполнен.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Не удалось поместить объект в указанное место.  Повторите попытку.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Вы не можете создавать деревья и траву на чужой земле.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]».
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Выбран дубликат без корневых объектов.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Невозможно дублировать объекты: регион заполнен.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Невозможно дублировать объекты: не удалось найти их участок.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Нельзя создать объект: 
-участок уже заполнен.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Не удалось выложить объект.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Невозможно создать элемент, который вызвал проблемы в этом регионе.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Этот предмет инвентаря находится в черном списке.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Сейчас вам не разрешено создавать объекты.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Поиск по земле заблокирован.
-Вы провели слишком много операций поиска за короткое время.
-Повторите попытку через минуту.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Вы умерли и были телепортированы в ваше домашнее местоположение
-	</notification>
-	<notification name="EjectComingSoon">
-		Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Вам нет доступа в этот регион: 
-серпер переполнен.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Сохранение в инвентаре отключено.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]».
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]».
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется.
-	</notification>
-	<notification name="NoModNoTaking">
-		Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
-	</notification>
-	<notification name="RezDestInternalError">
-		Внутренняя ошибка: неизвестный тип места назначения.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Невозможно удалить: объект не найден
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Невозможно выбросить этого пользователя.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
-	</notification>
-	<notification name="HomePositionSet">
-		Задано положение дома.
-	</notification>
-	<notification name="AvatarEjected">
-		Аватар выброшен.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Не удалось выбросить: у вас нет прав администратора на этом участке.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		У вас нет прав на изменение этого объекта
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Нельзя включить физику для объекта, который относится к навигационной сетке.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Нельзя включить физику для объектов с ключевыми кадрами.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Нельзя включить физику для объекта -- недостаточно земельных ресурсов.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке.
-	</notification>
-	<notification name="UnableAddItem">
-		Невозможно добавить предмет!
-	</notification>
-	<notification name="UnableEditItem">
-		Редактирование невозможно!
-	</notification>
-	<notification name="NoPermToEdit">
-		Редактирование не разрешено.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Не разрешено копировать этот инвентарь.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Нельзя сохранить в содержимом объекта: предмет уже не существует.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта.
-	</notification>
-	<notification name="TooManyScripts">
-		Слишком много скриптов.
-	</notification>
-	<notification name="UnableAddScript">
-		Невозможно добавить скрипт!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Сервер активов не ответил в заданное время.  Объект возвращен в симулятор.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		В этом регионе не разрешены фигуры с физическими данными.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Нельзя изменять навигационную сетку за пределами региона.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Нельзя задать свойства физики для объекта этого типа.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Нельзя задать корневой примитив без фигуры.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		В этом регионе не разрешены материалы с физическими данными.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Настройка материалов с физическими данными разрешена только для корневых примитивов.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Присвоение персонажам материалов с физическими данными еще не поддерживается.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Одно или несколько свойств указанного материала с физическими данными недопустимы.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Не разрешается изменять тип стыковки меш-объекта.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Не разрешается изменять форму меш-объекта
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Вам нет доступа в этот регион: \nрегион заполнен.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Связь невозможна -- разные владельцы
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Связь невозможна – нельзя изменять навигационную сетку за пределами региона.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Связь невозможна: у вас нет разрешения на редактирование.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Связь невозможна -- слишком много примитивов
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Связь невозможна -- нельзя связать некопируемый и непереносимый объекты
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Связь невозможна -- нет связываемых объектов.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Связь невозможна -- слишком много персонажей с поиском пути
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Связь невозможна -- недостаточно земельных ресурсов
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Объект использует слишком много ресурсов физики -- динамическое поведение отключено.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Вы были телепортированы домой объектом «[OBJECT_NAME]»
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Вы были телепортированы прикрепленным объектом [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Невозможно создать запрошенный объект. Регион уже заполнен.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Нельзя присоединить несколько объектов к одной точке.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Здесь нельзя создать несколько объектов.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Невозможно создать запрошенный объект. Объекта нет в базе данных.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Невозможно создать запрошенный объект. Повторите попытку.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Не удалось выложить, загрузка нужного объекта длится слишком долго.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Не удалось поместить объект в указанное место.  Повторите попытку.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Вам нельзя создавать растения на этой земле.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Невозможно восстановить объект. Не найдена позиция в игровом мире.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Невозможно выложить объект: его данные сетки неверны.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Невозможно выложить объект: в этом регионе уже сликом много скриптов.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Ваши привилегии доступа не разрешают создание объектов на этом месте.
-	</notification>
-	<notification name="CantCreateObject">
-		Сейчас вам не разрешено создавать объекты.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Неверные параметры объекта
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Ваши привилегии доступа не разрешают дублирование объектов на этом месте.
-	</notification>
-	<notification name="CantChangeShape">
-		Вам не разрешено изменять эту фигуру.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Ваши привилегии доступа не разрешают претендовать на объекты на этом месте.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Не удалось передать: вам не разрешено передавать объекты для этой группы.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Ваши привилегии доступа не разрешают покупать объекты на этом месте.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Невозможно присоединить объект: на нем сидит аватар.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Деревья и траву нельзя носить как прикрепленные объекты.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Нельзя присоединять объекты, принадлежащие группе.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Нельзя прикреплять объекты, которыми вы не владеете.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Невозможно присоединить объекты, которые относятся к навигационной сетке.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Нельзя присоединить объект: вам не разрешено его перемещать.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Нельзя сбросить объект здесь.  Участок уже заполнен.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Нельзя коснуться/взять этот объект: вы забанены на этом участке.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Уточните параметры удаления.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Невозможно отправить актив.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Не удалось найти пользователя для телепортации домой
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		режим творца недоступен
-	</notification>
-	<notification name="GenericRequestFailed">
-		не удалось выполнить общий запрос
-	</notification>
-	<notification name="CantUploadPostcard">
-		Невозможно отправить открытку.  Повторите попытку позже.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Невозможно получить данные инвентаря для группового уведомления.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Невозможно отправить групповое уведомление -- не разрешено.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Невозможно отправить групповое уведомление -- не удалось собрать инвентарь.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Невозможно проанализировать инвентарь, указанный в уведомлении.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Не удалось загрузить ландшафт.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Файл ландшафта записан.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Файл ландшафта записан, начинается загрузка...
-	</notification>
-	<notification name="TerrainBaked">
-		Ландшафт готов.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Для покупки этого участка необходимо обновить клиент.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Невозможно купить, этот участок не предназначен для продажи.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Невозможно купить: цена или площадь земли изменились.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Вам не разрешено покупать этот участок.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Здесь нельзя создавать объекты – участок будет переполнен.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Выбрано недостаточно арендуемых участков для вступления.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -&gt; Сообщить об ошибке...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Земля разделена.
-	</notification>
-	<notification name="PassPurchased">
-		Вы приобрели пропуск.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		В регионе не разрешены рекламные объявления.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Ваш пропуск на эту землю скоро закончится.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Здесь нет места, чтобы сесть. Попробуйте в другом месте.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Невозможно претендовать на объект: у вас нет разрешения
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Невозможно претендовать на объект: у вас не хватает L$.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Нельзя передать землю, принадлежащую группе.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Не удалось купить объект: у вас не хватает L$.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Не удалось купить инвентарь: у вас не хватает L$.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		У вас недостаточно L$, чтобы заплатить за проход на эту землю.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Сейчас нельзя купить пропуск.  Повторите попытку позже.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Невозможно создать объект:\nучасток заполнен.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Не удалось поместить объект в указанное место.  Повторите попытку.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Невозможно создать закладку для события.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Сила творца одолевает заморозку!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Не удалось выполнить запрос на особые способности. Запрос зарегистрирован.
-	</notification>
-	<notification name="ExpireExplanation">
-		Система сейчас не может обработать ваш запрос. Истекло время запроса.
-	</notification>
-	<notification name="DieExplanation">
-		Система не может обработать ваш запрос.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Недостаточно денег для создания примитива.
-	</notification>
-	<notification name="RezObjectFailure">
-		Недостаточно денег для создания объекта.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Недопустимое домашнее местоположение; восстановлено стандартное местоположение.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
-	</notification>
-	<notification name="SetHomePosition">
-		Домашнее местоположение задано.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Невозможно забрать объект: сбой инвентаря.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Невозможно создать требуемый инвентарь.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Невозможно создать требуемую папку инвентаря.
-	</notification>
-	<notification name="CantCreateInventory">
-		Невозможно создать этот инвентарь.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Невозможно создать закладку.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Сейчас нельзя создать костюм. Попробуйте через минуту.
-	</notification>
-	<notification name="InventoryNotForSale">
-		Инвентарь не для продажи.
-	</notification>
-	<notification name="CantFindInvItem">
-		Не удалось найти предмет из инвентаря.
-	</notification>
-	<notification name="CantFindObject">
-		Не удалось найти объект.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Сейчас в этом регионе запрещен перевод денег на объекты.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Непонятно, кому платить.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Нельзя отдавать L$ за общедоступные объекты.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Не удалось создать инвентарь в объекте игрового мира.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Не удалось обновить клиент из-за внутренней ошибки.  Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Нельзя создавать большие примитивы, которые пересекаются с другими игроками.  Повторите попытку, когда другие игроки уйдут.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов.
-		<usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены.
-		<usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Невозможно переместить файлы. Восстановлен прежний путь.
-		<usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
index 4866bb7ed6..75e396222f 100644
--- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/>
 	<icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/>
 	<icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/>
-	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
index 70a1b25996..214ca8bf3a 100644
--- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Фильтр" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/>
-		<menu_button name="view_btn" tool_tip="Параметры сортировки"/>
-		<menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/>
-		<button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Список заблокированных жителей"/>
+	<text name="title_text">
+		Черный список
+	</text>
+	<scroll_list name="blocked" tool_tip="Список заблокированных жителей"/>
+	<button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/>
+	<button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/>
+	<button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
deleted file mode 100644
index 4fdb4f9122..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(загрузка)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
deleted file mode 100644
index 98fe7b99be..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Включая голосовой чат"/>
-	<icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/>
-	<button name="delete_btn" tool_tip="Удалить эту запись"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index b043ffbbe2..7f000fb5a0 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
-	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 7da7fb3191..607921f2d6 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском].
 	</string>
+	<string name="people_filter_label" value="Фильтр для людей"/>
+	<string name="groups_filter_label" value="Фильтр для групп"/>
 	<string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/>
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
+	<filter_editor label="Фильтр" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Фильтр для людей" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Опции"/>
+				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
 			</panel>
 		</panel>
-		<panel label="ДРУЗЬЯ" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Фильтр для людей" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/>
-				<dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
-			</panel>
+		<panel label="МОИ ДРУЗЬЯ" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Предложить жителю дружбу"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="ГРУППЫ" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Фильтр для групп" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/>
-				<menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
-				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
+		<panel label="МОИ ГРУППЫ" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Опции"/>
+				<button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
+				<button name="activate_btn" tool_tip="Активировать выбранную группу"/>
 			</panel>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Фильтр для людей" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
-				<dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Опции"/>
+				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
 			</panel>
 		</panel>
-		<panel label="БЛОКИРОВАН" name="blocked_panel">
-			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 6383fc8c2c..9283fc9e6e 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<panel>
-		<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
-		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
-		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Размер шрифта:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Мелкий" name="Small" value="0"/>
-			<item label="Средний" name="Medium" value="1"/>
-			<item label="Крупный" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Уведомления
-		</text>
-		<text name="friend_ims">
-			IM друзей:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IM чужих:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="conference_ims">
-			IM конференции:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="group_chat">
-			Групповой чат:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Локальный чат:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Звук:
-		</text>
-		<check_box label="Новый разговор" name="new_conversation"/>
-		<check_box label="Входящий голосовой вызов" name="incoming_voice_call"/>
-		<check_box label="Предложение телепортации" name="teleport_offer"/>
-		<check_box label="Предложение инвентаря" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Очистить журнал..." name="clear_log"/>
-		<button label="Удалить записи..." name="delete_transcripts"/>
-		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Размер шрифта:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Мелкий" name="radio" value="0"/>
+		<radio_item label="Средний" name="radio2" value="1"/>
+		<radio_item label="Крупный" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+	<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
+	<check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/>
+	<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Показывать сообщения:
+	</text>
+	<text name="requires_restart_label">
+		(требуется перезапуск)
+	</text>
+	<radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)">
+		<radio_item label="В отдельных окнах" name="radio" value="0"/>
+		<radio_item label="На вкладках" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Включить всплывающие сообщения с новыми репликами в чате:
+	</text>
+	<check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/>
+	<check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/>
+	<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
+	<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
 	<button label="Перевод..." name="ok_btn"/>
 	<button label="Автозамена..." name="autoreplace_showgui"/>
 	<button label="Проверка правописания..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index c7a850f78a..d1bfedf2d8 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Ответ в режиме «Не беспокоить»:
+		Ответ в режиме «Занят»:
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index 5502530ca4..e9dd3760b5 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Купить объект" name="Buyobject"/>
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
-			<combo_box.item label="Приблизить" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index d7d4df4a37..f9ded799bf 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=ru-RU&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
@@ -619,7 +619,7 @@ support@secondlife.com.
 	<string name="AvatarAway">
 		Нет на месте
 	</string>
-	<string name="AvatarDoNotDisturb">
+	<string name="AvatarBusy">
 		Не беспокоить
 	</string>
 	<string name="AvatarMuted">
@@ -856,12 +856,6 @@ support@secondlife.com.
 	<string name="ST_NO_JOINT">
 		Не удается найти объект ROOT или JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Локальный чат
-	</string>
-	<string name="NearbyChatLabel">
-		(Локальный чат)
-	</string>
 	<string name="whisper">
 		шепчет:
 	</string>
@@ -925,15 +919,12 @@ support@secondlife.com.
 	<string name="ControlYourCamera">
 		Управлять камерой
 	</string>
-	<string name="NotConnected">
-		Нет подключения
-	</string>
-	<string name="AgentNameSubst">
-		(Вы)
-	</string>
 	<string name="TeleportYourAgent">
 		Телепортировать вас
 	</string>
+	<string name="NotConnected">
+		Нет подключения
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -1015,6 +1006,18 @@ support@secondlife.com.
 	<string name="dictionary_files">
 		Словари
 	</string>
+	<string name="AvatarSetNotAway">
+		На месте
+	</string>
+	<string name="AvatarSetAway">
+		Нет на месте
+	</string>
+	<string name="AvatarSetNotBusy">
+		Не занят(а)
+	</string>
+	<string name="AvatarSetBusy">
+		Не беспокоить
+	</string>
 	<string name="shape">
 		Фигура
 	</string>
@@ -1983,8 +1986,8 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		Новый скрипт
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже.
+	<string name="BusyModeResponseDefault">
+		У адресата вашего сообщения задан статус «Не беспокоить».  Ваше сообщение все равно будет отображено на панели IM для просмотра позже.
 	</string>
 	<string name="MuteByName">
 		(по имени)
@@ -2097,6 +2100,9 @@ support@secondlife.com.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Контент
+	</string>
 	<string name="AcquiredItems">
 		Купленные вещи
 	</string>
@@ -3865,7 +3871,7 @@ support@secondlife.com.
 		Область общей дозволенности
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Аватары на этом участке невидимы и неслышимы для аватаров с других участков
+		Все жители с других участков могут видеть аватары и общаться в чате
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
@@ -3942,12 +3948,6 @@ support@secondlife.com.
 	<string name="IM_unblock_only_groups_friends">
 		Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность».
 	</string>
-	<string name="OnlineStatus">
-		Онлайн
-	</string>
-	<string name="OfflineStatus">
-		Оффлайн
-	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
 	</string>
@@ -3957,9 +3957,6 @@ support@secondlife.com.
 	<string name="you_joined_call">
 		Вы присоединились к голосовой беседе
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить».
-	</string>
 	<string name="name_started_call">
 		Житель [NAME] начал голосовую беседу
 	</string>
@@ -3976,7 +3973,7 @@ support@secondlife.com.
 		Соединяется...
 	</string>
 	<string name="conference-title">
-		Чат с несколькими участниками
+		Спонтанная конференция
 	</string>
 	<string name="conference-title-incoming">
 		Конференция с жителем [AGENT_NAME]
@@ -4868,9 +4865,6 @@ support@secondlife.com.
 	<string name="Command_Chat_Label">
 		Чат
 	</string>
-	<string name="Command_Conversations_Label">
-		Разговоры
-	</string>
 	<string name="Command_Compass_Label">
 		Компас
 	</string>
@@ -4946,9 +4940,6 @@ support@secondlife.com.
 	<string name="Command_Chat_Tooltip">
 		Обменивайтесь текстовыми репликами с людьми вокруг вас
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Поговорить со всеми
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Компас
 	</string>
@@ -5078,13 +5069,4 @@ support@secondlife.com.
 	<string name="UserDictionary">
 		[Пользователь]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
deleted file mode 100644
index 5f8dac506f..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ">
-	<panel name="buttons_panel">
-		<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
deleted file mode 100644
index 84403dfd68..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="KONUŞMA:">
-	<floater.string name="Title">
-		KONUŞMA: [NAME]
-	</floater.string>
-	<text name="page_label" value="Sayfa"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
index 6504430b3c..4451d1d309 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="SOHBETLER">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-					<button name="add_btn" tool_tip="Yeni bir sohbet başlat"/>
-					<button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/>
-					<text name="stub_textbox">
-						Sohbet ayrı bir pencerede.   [secondlife:/// Bunu geri getir.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="SOHBETLER"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index 8ce8f0fe13..bed08b36c6 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] sohbete davet edildi."/>
-	<floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/>
-	<floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/>
-	<floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/>
-	<floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/>
-	<floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-				<menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<button name="add_btn" tool_tip="Bu sohbete birini ekle"/>
-				<button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/>
-				<button name="close_btn" tool_tip="Bu sohbeti bitir"/>
-				<button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Kime" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="Kime" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
index 0f2b27241e..adb03c2dff 100644
--- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonim
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		sizi arıyor.
+		arıyor.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		bir Sesli Sohbet aramasına bir konferans araması ile katıldı.
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</floater.string>
 	<text name="question">
-		Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek.
+		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</text>
-	<button label="Yanıtla" label_selected="Yanıtla" name="Accept"/>
-	<button label="Yok say" label_selected="Yok say" name="Reject"/>
-	<button label="Bunun yerine Aİ aç" name="Start IM"/>
+	<button label="Kabul Et" label_selected="Kabul Et" name="Accept"/>
+	<button label="Reddet" label_selected="Reddet" name="Reject"/>
+	<button label="Aİ Başlat" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 35f47e6dfa..6eecc7fb77 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Göster:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Dünya" name="show_world"/>
 			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
 			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 42483c09e1..889425f23a 100644
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
 	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
-	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Önizleme Devre Dışı"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
deleted file mode 100644
index ec350bee60..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ">
-	<slider label="Sesli Sohbet" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
index 7a157244cd..3534a3fe90 100644
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
+<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME">
 	<string name="no_voice_effect">
 		(Ses Şekillendirme Yok)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
deleted file mode 100644
index acf99d6199..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="SES DÜZEYİ">
-	<slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
index 9480d30029..f910e1fe91 100644
--- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/>
-	<menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/>
+	<menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
deleted file mode 100644
index 31404f2501..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
-	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
-	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
-	<menu_item_call label="Profili Göster" name="view_profile"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
-	<menu_item_call label="Sesli arama" name="voice_call"/>
-	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
-	<menu_item_call label="Arkadaş ekle" name="add_friend"/>
-	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
-	<menu_item_call label="Arkadaşları çıkar" name="remove_friends"/>
-	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Harita" name="map"/>
-	<menu_item_call label="Paylaş" name="share"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_check label="Sesi Engelle" name="block_unblock"/>
-	<menu_item_check label="Metni Engelle" name="MuteText"/>
-	<menu_item_call label="Grup Profili" name="group_profile"/>
-	<menu_item_call label="Grubu Etkinleştir" name="activate_group"/>
-	<menu_item_call label="Gruptan Ayrıl" name="leave_group"/>
-	<context_menu label="Moderatör Seçenekleri" name="Moderator Options">
-		<menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/>
-		<menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/>
-		<menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
deleted file mode 100644
index 9e91780eb8..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="Aİ..." name="IM"/>
-	<menu_item_call label="Sesli arama..." name="Call"/>
-	<menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/>
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
-	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
-	<menu_item_call label="Gruba davet et..." name="Invite"/>
-	<menu_item_call label="Harita" name="Map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
deleted file mode 100644
index 9a77eaadd9..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
-	<menu_item_check label="Tarihe göre sırala" name="sort_by_date"/>
-	<menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/>
-	<menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
deleted file mode 100644
index 3b9738edce..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
-	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
-	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
-	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
-	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Harita" name="map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Sesi Engelle" name="Block/Unblock"/>
-	<menu_item_check label="Metni Engelle" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
deleted file mode 100644
index c4d4357ac9..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Daraltılmış görünüm" name="compact_view"/>
-	<menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/>
-	<menu_item_check label="Zamanı göster" name="IMShowTime"/>
-	<menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 3d5c68d9d3..34a2661d8a 100644
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Nesne Profili..." name="Object Profile"/>
 	<menu_item_call label="Engelle..." name="Block"/>
-	<menu_item_call label="Haritada Göster" name="show_on_map"/>
-	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index 674041e9c9..d2e7e7107a 100644
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Yeni Saç" name="New Hair"/>
 		<menu_item_call label="Yeni Gözler" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Tüm klasörleri genişlet" name="expand"/>
-	<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
 	<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
 	<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
deleted file mode 100644
index e9411ff350..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/>
-	<menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/>
-	<menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/>
-	<menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/>
-	<menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/>
-	<menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/>
-	<menu_item_check label="Sohbet günlüğü..." name="Conversation"/>
-	<menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/>
-	<menu_item_check label="Çeviri ayarları..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
deleted file mode 100644
index 2bf1101b48..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
-	<menu_item_call label="Profil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
deleted file mode 100644
index a869e2ae7d..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/>
-	<menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
deleted file mode 100644
index 14b3de3a9f..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
-	<menu_item_check label="Türe göre sırala" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
deleted file mode 100644
index 609584d6a6..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
-	<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
index 743b01844d..9f2946e310 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Bilgileri Görüntüle" name="View Info"/>
 	<menu_item_call label="Sohbet" name="Chat"/>
-	<menu_item_call label="Sesli arama" name="Call"/>
+	<menu_item_call label="Ara" name="Call"/>
 	<menu_item_call label="Etkinleştir" name="Activate"/>
 	<menu_item_call label="Ayrıl" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
deleted file mode 100644
index e550b20add..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index 2d61461c91..ee859a9450 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profili Göster" name="view_profile"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
-	<menu_item_call label="Sesli arama" name="voice_call"/>
-	<menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/>
-	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
-	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Harita" name="map"/>
-	<menu_item_call label="Paylaş" name="share"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
+	<menu_item_call label="Aİ" name="IM"/>
+	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Harita" name="Map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
index 20695d98e8..5c89f87906 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Arkadaş Ekle" name="add_friends"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Ara" name="call"/>
-	<menu_item_call label="Paylaş" name="share"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friends"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
+	<menu_item_call label="Aİ" name="IM"/>
+	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
deleted file mode 100644
index 59ea7c145f..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_check label="Haritayı Göster" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
deleted file mode 100644
index 02be715ed2..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index b14a0509bf..d82b52aea8 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profili Göster" name="show_agent"/>
-	<menu_item_call label="Aİ Gönder..." name="send_im"/>
-	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
+	<menu_item_call label="Sakin Profilini Göster" name="show_agent"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index 00fa3c27c2..d55e34c11c 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Nesne Profili..." name="show_object"/>
+	<menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index c465966fc7..7a7faf6ac4 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Durum" name="Status"/>
+		<menu label="Durum" name="Status">
+			<menu_item_call label="Uzakta" name="Set Away"/>
+			<menu_item_call label="Meşgul" name="Set Busy"/>
+		</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="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -27,18 +30,14 @@
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
-		<menu_item_check label="Sohbetler..." name="Conversations"/>
-		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
+		<menu_item_check label="Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
-		<menu label="Ses şekillendirme" name="VoiceMorphing">
-			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
-			<menu_item_check label="Önizleme..." name="Preview"/>
-			<menu_item_call label="Abone ol..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Ses ayarları..." name="Nearby Voice"/>
+		<menu_item_check label="Ses şekillendirme..." name="ShowVoice"/>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
-		<menu_item_check label="Arkadaşlar" name="My Friends"/>
-		<menu_item_check label="Gruplar" name="My Groups"/>
-		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_call label="Arkadaşlar" name="My Friends"/>
+		<menu_item_call label="Gruplar" name="My Groups"/>
+		<menu_item_call label="Yakındaki kişiler" name="Active Speakers"/>
 		<menu_item_call label="Engelleme Listesi" name="Block List"/>
 	</menu>
 	<menu label="Dünya" name="World">
@@ -114,6 +113,7 @@
 			<menu_item_call label="Satın Al" name="Menu Object Buy"/>
 			<menu_item_call label="Al" name="Menu Object Take"/>
 			<menu_item_call label="Kopya Al" name="Take Copy"/>
+			<menu_item_call label="Envanterime Geri Kaydet" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Nesne İçeriklerine Geri Kaydet" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Nesneyi İade Et" name="Return Object back to Owner"/>
 		</menu>
@@ -128,7 +128,6 @@
 			<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Karakterler..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Görüntüleme / test..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Bölgeyi tekrar kaydet" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Seçenklr." name="Options">
 			<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
@@ -158,13 +157,6 @@
 	<menu label="Yardım" name="Help">
 		<menu_item_call label="Nasıl yapılır..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/>
-		<menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/>
-		<menu_item_call label="Bilgi Bankası" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Topluluk Forumları" name="Community Forums"/>
-		<menu_item_call label="Destek portalı" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] Haberleri" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/>
 		<menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/>
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
@@ -391,14 +383,9 @@
 				<menu_item_call label="Test Dişisi" name="Test Female"/>
 				<menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Animasyon Hızı" name="Animation Speed">
-				<menu_item_call label="Tüm Animasyonlar %10 Daha Hızlı" name="All Animations 10 Faster"/>
-				<menu_item_call label="Tüm Animasyonlar %10 Daha Yavaş" name="All Animations 10 Slower"/>
-				<menu_item_call label="Tüm Animasyon Hızlarını Sıfırla" name="Reset All Animation Speed"/>
-				<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/>
 			<menu_item_check label="Animasyon Bilgisi" name="Animation Info"/>
+			<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
 			<menu_item_check label="Şuraya Bak&apos;ı Göster" name="Show Look At"/>
 			<menu_item_check label="Şuraya İşaret Et&apos;i Göster" name="Show Point At"/>
 			<menu_item_check label="Eklem Güncelleştirmeleri İçin Hata Ayıklama" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index ad92a4b478..488702f9ca 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -516,24 +516,6 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
-
-    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
-
-    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=en-us
-		</url>
-		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -1564,13 +1546,10 @@ Gruptan ayrılmak istiyor musunuz?
 		Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Rahatsız Etme açık.  Gelen iletişimlerle ilgili size bilgi verilmeyecek.
-
-- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler &gt; Genel içerisinde ayarlanır).
-- Işınlanma teklifleri reddedilecektir.
-- Sesli aramalar reddedilecektir.
-		<usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/>
+	<notification name="BusyModeSet">
+		Durumunuz Meşgul olarak ayarlandı.
+Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek.
+		<usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin.
@@ -2054,10 +2033,6 @@ Envanter öğesi/öğeleri taşınsın mı?
 		Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz?
 		<usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur.  Tüm katılımcılara yeni sohbet bildirimi gönderilir.
-		<usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/>
@@ -2132,14 +2107,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
 			<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
 		</form>
 	</notification>
-	<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
-		Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
+	<notification label="Meşgul Durumu Uyarısı" name="BusyModePay">
+		Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir.
 
-Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
+Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz?
 		<form name="form">
-			<ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/>
-			<button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/>
-			<button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/>
+			<ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/>
+			<button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/>
+			<button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2274,8 +2249,11 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 	<notification name="GroupNotice">
 		Konu: [SUBJECT], İleti: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; durumu: [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimiçi
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimdışı
 	</notification>
 	<notification name="AddSelfFriend">
 		Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz.
@@ -2504,6 +2482,13 @@ Burada uçamazsınız.
 	<notification name="DynamicPathfindingDisabled">
 		Bu bölgede dinamik yol bulma etkin değil.  Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir.  Hareket eden başka nesnelerin doğru davranmasını sağlamak için “Bölgeyi yeniden kaydet” düğmesine tıklayın.  Daha fazla bilgi edinmek için “Yardım” seçimini yapın.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Yardım" ignoretext="Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir." name="okhelpignore" yestext="Tamam"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Bir hata meydana geldi.  Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz.  Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer.
 		<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2766,7 +2751,7 @@ Kabul ediyor musunuz?
 	<notification name="ScriptQuestionCaution">
 		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
   
-Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
+Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
 			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
@@ -3348,626 +3333,4 @@ Girişim iptal edildi.
 		[NUM_ITEMS] öğeyi siliyorsunuz.  Devam etmek istediğinize emin misiniz?
 		<usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar donduruldu.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] sizin dondurulmanızı kaldırdı.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar artık dondurulmuş değil.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Üzgünüz, bu kullanıcı dondurulamaz.
-	</notification>
-	<notification name="NowOwnObject">
-		Artık [OBJECT_NAME] nesnesinin sahibisiniz
-	</notification>
-	<notification name="CantRezOnLand">
-		[OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor.  Arazinin sahibini görmek için arazi aracını kullanın.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Çok fazla talep olduğu için nesne oluşturulamadı.
-	</notification>
-	<notification name="SitFailCantMove">
-		Oturamazsınız çünkü şu anda hareket edemezsiniz.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Oturamazsınız çünkü bu araziye girme izniniz yok.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Daha yakına gelmeyi deneyin.  Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Yeni nesne oluşturulamıyor. Bölge dolu.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		&apos;[OBJ_NAME]&apos; nesnesi size aktarılamadığı için kopyalama başarılamadı.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		&apos;[OBJ_NAME]&apos; nesnesi navmesh&apos;e katkıda bulunduğu için kopyalama başarılamadı.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Kök nesne seçili olmayan kopya.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Nesneler çoğaltılamıyor çünkü bölge dolu.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Nesne oluşturulamıyor çünkü
-parsel dolu.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Bir nesneyi oluşturma girişimi başarısız oldu.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Bu envanter öğesi kara listeye alınmış.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Şu anda nesne oluşturmanıza izin verilmiyor.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Arazi Arama Engellendi.
-Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz.
-Lütfen bir dakika sonra tekrar deneyin.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız
-	</notification>
-	<notification name="EjectComingSoon">
-		Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Bu bölgeye giremezsiniz çünkü 
-sunucu dolu.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Envantere Geri Kaydet devre dışı bırakıldı.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		&apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		&apos;[DEST_NAME]&apos; nesnesini değiştirme izniniz olmadığı için &apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		&apos;[OBJ_NAME]&apos; envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
-	</notification>
-	<notification name="NoTransNoCopy">
-		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		Benzeticiden &apos;[OBJ_NAME]&apos; nesnesinin kaldırılmasına izinler sistemi izin vermiyor.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		&apos;[OBJ_NAME]&apos; nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz.
-	</notification>
-	<notification name="NoModNoTaking">
-		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız.
-	</notification>
-	<notification name="RezDestInternalError">
-		Dahili Hata: Bilinmeyen hedef türü.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Nesne bulunamadığı için silme başarılamadı
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Üzgünüz, bu kullanıcı çıkartılamaz.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
-	</notification>
-	<notification name="HomeLocationLimits">
-		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
-	</notification>
-	<notification name="HomePositionSet">
-		Ana konum ayarlandı.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar çıkartıldı.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh&apos;i bölge sınırları ötesinde değiştiremezsiniz.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Bu nesneyi değiştirme izniniz yok
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Navmesh&apos;e katkıda bulunan bir nesne için fizik etkinleştirilemez.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Anahtar karelenmiş nesneler için fizik etkinleştirilemez.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Fizik kaynağı maliyeti [MAX_OBJECTS]&apos;dan büyük nesne için fizik etkinleştirilemedi
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Bu nesne fantom olduğu ve navmesh&apos;e katkıda bulunduğu için konkav bir parçaya sahip olamaz.
-	</notification>
-	<notification name="UnableAddItem">
-		Öğe eklenemedi!
-	</notification>
-	<notification name="UnableEditItem">
-		Bu düzenlenemiyor!
-	</notification>
-	<notification name="NoPermToEdit">
-		Bunu düzenleme izni yok.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Bu envanteri kopyalama izni yok.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
-	</notification>
-	<notification name="TooManyScripts">
-		Çok fazla komut dosyası.
-	</notification>
-	<notification name="UnableAddScript">
-		Komut dosyası eklenemedi!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Varlık sunucusu zamanında yanıt vermedi.  Nesne sime iade edildi.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Bu bölgede fiziksel şekiller etkin değil.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Bu nesne türü üzerinde fizik özellikleri ayarlanamaz.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Kök prim şekilsiz olacak şekilde ayarlanamaz.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Bu bölgede fiziksel malzemeler etkin değil.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Sadece kök primlerin fizik malzemeleri ayarlanabilir.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Bir örgü nesnesinin dikiş türünü değiştiremezsiniz.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Bir örgü nesnesinin şeklini değiştiremezsiniz
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Bu bölgeye giremezsiniz çünkü \nbölge dolu.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Bağlantı başarısız oldu -- sahipler farklı
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Bağlntı başarılamadı -- navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Bağlantı başarısız oldu -- çok fazla ilkel öğe var
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Bağlantı başarısız oldu -- arazi kaynakları yetersiz
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		&apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
-	</notification>
-	<notification name="TeleportedByAttachment">
-		You have been teleported by an attachment on [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Bilinmeyen bir sahibi olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Talep edilen nesne oluşturulamıyor. Bölge dolu.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Tek bir noktaya birden fazla nesne iliştiremezsiniz.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Burada birden fazla nesne oluşturamazsınız.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Bu arazide bitkiler oluşturamazsınız.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Nesne geri yüklenemiyor. Dünya konumu bulunamadı.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Örgü verileri geçersiz olduğu için nesne oluşturulamadı.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor.
-	</notification>
-	<notification name="CantCreateObject">
-		Şu anda nesne oluşturmanıza izin verilmiyor.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Geçersiz nesne parametreleri
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor.
-	</notification>
-	<notification name="CantChangeShape">
-		Bu şekli değiştirmenize izin verilmiyor.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Üzerinde bir avatar oturduğu için nesne iliştirilemiyor.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Ağaçlar ve çimen aksesuar olarak giyilemez.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Sahibi grup olan nesneler iliştirilemiyor.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Sahip olmadığınız nesneleri iliştiremezsiniz.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Navmesh&apos;e katkıda bulunan nesneler iliştirilemez.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Aksesuar düşürülemedi: Burada düşürme izniniz yok.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Nesne buraya düşürülemez.  Parsel dolu.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Lütfen silme parametrelerinizi daraltın.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Varlık karşıya yüklenemiyor.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Ana konuma ışınlanacak kullanıcı bulunamadı
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		tanrısal talep başarısız oldu
-	</notification>
-	<notification name="GenericRequestFailed">
-		genel talep başarısız oldu
-	</notification>
-	<notification name="CantUploadPostcard">
-		Posta kartı karşıya yüklenemiyor.  Daha sonra tekrar deneyin.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Grup bildirimi için envanter ayrıntıları alınamadı.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Grup bildirimi gönderilemedi -- izin verilmiyor.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Grup bildirimi gönderilemedi -- envanter oluşturulamadı.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Bildirimde envanter ayrıştırılamadı.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Yüzeyin karşıya yüklemesi başarılamadı.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Yüzey dosyası yazıldı.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor...
-	</notification>
-	<notification name="TerrainBaked">
-		Yüzey kaydedildi.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Satın alınamıyor, bu parsel satılık değil.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Bu parsel için yetkili alıcı değilsiniz.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -&gt; Hata Bildir ile bildirin...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Arazi bölündü.
-	</notification>
-	<notification name="PassPurchased">
-		Bir geçiş hakkı satın aldınız.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Bölgede seri ilanlara izin verilmiyor.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Bu arazi için geçiş hakkınız sona ermek üzere.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Burada oturacak yer yok, başka bir yer deneyin.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Grubun sahip olduğu araziyi devredemezsiniz.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Şu anda geçiş hakkı satın alınamıyor.  Daha sonra tekrar deneyin.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Nesne oluşturulamıyor çünkü \nparsel dolu.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Etkinlik için yer imi oluşturulamıyor.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Tanrısal güçleriniz dondurmayı devre dışı bıraktı!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi.
-	</notification>
-	<notification name="ExpireExplanation">
-		Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı.
-	</notification>
-	<notification name="DieExplanation">
-		Sistem talebinizi işleyemiyor.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		İlkel öğeyi oluşturmak için yeterli fon yok.
-	</notification>
-	<notification name="RezObjectFailure">
-		Nesneyi oluşturmak için yeterli fon yok.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Ana konum sıfırlandı çünkü Ana konum yasal değildi.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
-	</notification>
-	<notification name="SetHomePosition">
-		Ana konum ayarlandı.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Envanter hatasından ötürü nesne oluşturulması geri alınamıyor.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Talep edilen envanter oluşturulamadı.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Talep edilen envanter klasörü oluşturulamadı.
-	</notification>
-	<notification name="CantCreateInventory">
-		Bu envanter oluşturulamadı.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Yer imi oluşturulamıyor.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin.
-	</notification>
-	<notification name="InventoryNotForSale">
-		Envanter satılık değil.
-	</notification>
-	<notification name="CantFindInvItem">
-		Envanter öğesi bulunamıyor.
-	</notification>
-	<notification name="CantFindObject">
-		Nesne bulunamıyor.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Kime ödeme yapılacağı belirlenemedi.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Kamusal nesnelere L$ veremezsiniz.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Dünya içerisindeki nesnede envater oluşturma başarısız oldu.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik.  Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Başka oyuncularla kesişen büyük primler oluşturulamaz.  Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir.
-		<usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir.
-		<usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Dosyalar taşınamıyor. Önceki yol geri yüklendi.
-		<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
index f330bd85e8..7542778aca 100644
--- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/>
 	<icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/>
 	<icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/>
-	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
index 87b67e249e..0464b7ec07 100644
--- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtrele" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/>
-		<menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/>
-		<menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/>
-		<button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
+	<text name="title_text">
+		Listeyi Engelle
+	</text>
+	<scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
+	<button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/>
+	<button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/>
+	<button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
deleted file mode 100644
index c7227f02b6..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(yükleniyor)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
deleted file mode 100644
index 79895f9c21..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/>
-	<icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/>
-	<button name="delete_btn" tool_tip="Bu girişi kaldır"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
index f44d2b5e76..2bc597f2fa 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Bilinmiyor"/>
-	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 08efd0aa61..1a1e53bac2 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -14,53 +14,81 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_filtered_friends_msg">
 		Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin.
 	</string>
+	<string name="people_filter_label" value="Kişileri Filtrele"/>
+	<string name="groups_filter_label" value="Grupları Filtrele"/>
 	<string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/>
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
+	<filter_editor label="Filtrele" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
+				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
 			</panel>
 		</panel>
-		<panel label="ARKADAŞLAR" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Kişileri Filtrele" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/>
-				<button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/>
-				<dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
-			</panel>
+		<panel label="ARKADAŞLARIM" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPLAR" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Grupları Filtrele" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/>
-				<menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/>
-				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
-				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
+		<panel label="GRUPLARIM" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
+				<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
+				<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
 			</panel>
 		</panel>
 		<panel label="SON" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Kişileri Filtrele" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/>
-				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
-				<dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
+				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
 			</panel>
 		</panel>
-		<panel label="ENGELLENMİŞ" name="blocked_panel">
-			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index aaeebdfe6e..231e8fc5fe 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
-		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
-		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Font büyüklüğü:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Küçük" name="Small" value="0"/>
-			<item label="Orta" name="Medium" value="1"/>
-			<item label="Büyük" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Bildirimler
-		</text>
-		<text name="friend_ims">
-			Arkadaş Aİ&apos;leri:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			Arkadaş harici Aİ&apos;ler:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			Konferans Aİ&apos;leri:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Grup sohbeti:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Yakındaki sohbet:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Sesi çal:
-		</text>
-		<check_box label="Yeni sohbet" name="new_conversation"/>
-		<check_box label="Gelen sesli arama" name="incoming_voice_call"/>
-		<check_box label="Işınlama teklifi" name="teleport_offer"/>
-		<check_box label="Envanter teklifi" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Günlüğü temizle..." name="clear_log"/>
-		<button label="Dökümleri sil..." name="delete_transcripts"/>
-		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Font büyüklüğü:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Küçük" name="radio" value="0"/>
+		<radio_item label="Orta" name="radio2" value="1"/>
+		<radio_item label="Büyük" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
+	<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
+	<check_box label="Düz metin Aİ&apos;ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/>
+	<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Aİ&apos;leri şurada göster:
+	</text>
+	<text name="requires_restart_label">
+		(tekrar başlatma gerekir)
+	</text>
+	<radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
+		<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
+		<radio_item label="Sekmeler" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Gelen sohbet için açılır pencereleri etkinleştir:
+	</text>
+	<check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/>
+	<check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/>
+	<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
+	<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
 	<button label="Çeviri..." name="ok_btn"/>
 	<button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/>
 	<button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index 1a13cf8f71..4a48b1588c 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="asla" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Rahatsız Etme yanıtı:
+		Meşgul durumu cevabı:
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index 9a4cf54fa7..b0b9ab7716 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Nesneyi satın al" name="Buyobject"/>
 			<combo_box.item label="Nesneye ödeme yap" name="Payobject"/>
 			<combo_box.item label="Aç" name="Open"/>
-			<combo_box.item label="Yakınlaştır" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 155dc8749a..1be8f5974c 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=tr-TR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
@@ -619,8 +619,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AvatarAway">
 		Uzakta
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Rahatsız Etme
+	<string name="AvatarBusy">
+		Meşgul
 	</string>
 	<string name="AvatarMuted">
 		Engellenmiş
@@ -856,12 +856,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ST_NO_JOINT">
 		KÖK veya EKLEM bulunamıyor.
 	</string>
-	<string name="NearbyChatTitle">
-		Yakındaki sohbet
-	</string>
-	<string name="NearbyChatLabel">
-		(Yakındaki sohbet)
-	</string>
 	<string name="whisper">
 		fısıldar:
 	</string>
@@ -925,15 +919,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ControlYourCamera">
 		Kameranızı kontrol etmek
 	</string>
-	<string name="NotConnected">
-		Bağlı Değil
-	</string>
-	<string name="AgentNameSubst">
-		(Siz)
-	</string>
 	<string name="TeleportYourAgent">
 		Sizi ışınlama
 	</string>
+	<string name="NotConnected">
+		Bağlı Değil
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -1015,6 +1006,18 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="dictionary_files">
 		Sözlükler
 	</string>
+	<string name="AvatarSetNotAway">
+		Uzakta Değil
+	</string>
+	<string name="AvatarSetAway">
+		Uzakta
+	</string>
+	<string name="AvatarSetNotBusy">
+		Meşgul Değil
+	</string>
+	<string name="AvatarSetBusy">
+		Meşgul
+	</string>
 	<string name="shape">
 		Şekil
 	</string>
@@ -1983,8 +1986,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="PanelContentsNewScript">
 		Yeni Komut Dosyası
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Bu sakin &quot;Rahatsız Etme&quot; seçeneğini devreye almış, mesajınızı sonra görecek.
+	<string name="BusyModeResponseDefault">
+		İleti gönderdiğiniz Sakin &apos;meşgul modu&apos;nda, bu da rahatsız edilmek istemediği anlamına geliyor.  İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir.
 	</string>
 	<string name="MuteByName">
 		(Adına göre)
@@ -2097,6 +2100,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		İçerik
+	</string>
 	<string name="AcquiredItems">
 		Alınan Öğeler
 	</string>
@@ -3868,7 +3874,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Genel Bölge
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez
+		Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir.
@@ -3945,12 +3951,6 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="IM_unblock_only_groups_friends">
 		Bu mesajı görmek için Tercihler/Gizlilik&apos;de &apos;Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin&apos; seçeneğinin işaretini kaldırmalısınız.
 	</string>
-	<string name="OnlineStatus">
-		Çevrimiçi
-	</string>
-	<string name="OfflineStatus">
-		Çevrimdışı
-	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
@@ -3960,9 +3960,6 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="you_joined_call">
 		Sesli aramaya katıldınız
 	</string>
-	<string name="you_auto_rejected_call-im">
-		&quot;Rahatsız Etme&quot; seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz.
-	</string>
 	<string name="name_started_call">
 		[NAME] bir sesli arama başlattı
 	</string>
@@ -3979,7 +3976,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Bağlanıyor...
 	</string>
 	<string name="conference-title">
-		Çok kişili sohbet
+		Özel Konferans
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] ile konferans
@@ -4869,9 +4866,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Label">
 		Sohbet
 	</string>
-	<string name="Command_Conversations_Label">
-		Sohbetler
-	</string>
 	<string name="Command_Compass_Label">
 		Pusula
 	</string>
@@ -4947,9 +4941,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Tooltip">
 		Metin kullanarak yakındaki kişilerle sohbet etmek
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Herkesle sohbet et
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Pusula
 	</string>
@@ -5079,13 +5070,4 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
deleted file mode 100644
index 37115a0310..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="交談記錄">
-	<panel name="buttons_panel">
-		<filter_editor label="人員過濾器" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
-		<menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
deleted file mode 100644
index ece263f440..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="交談：">
-	<floater.string name="Title">
-		交談：[NAME]
-	</floater.string>
-	<text name="page_label" value="頁"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 84ad869100..2d66c659fe 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
-					<button name="add_btn" tool_tip="開始新的交談"/>
-					<button name="speak_btn" tool_tip="用麥克風和大家交談"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
-					<text name="stub_textbox">
-						這個交談另開了新視窗。   [secondlife:/// 把它收回來]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="交談"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index d63c5507db..808a0b6720 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
-	<floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
-	<floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
-	<floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
-	<floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
-	<floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
-				<menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<button name="add_btn" tool_tip="新增某人到這個交談"/>
-				<button name="voice_call_btn" tool_tip="建立語音通聯"/>
-				<button name="close_btn" tool_tip="結束這個交談"/>
-				<button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="至" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="至" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 4526eff21d..45a003d3c8 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		如果接聽，你將切斷目前的語音交談。
+		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</text>
-	<button label="接聽" label_selected="接聽" name="Accept"/>
-	<button label="忽視" label_selected="忽視" name="Reject"/>
-	<button label="不接聽但開啟 IM" name="Start IM"/>
+	<button label="接受" label_selected="接受" name="Accept"/>
+	<button label="拒絕" label_selected="拒絕" name="Reject"/>
+	<button label="開始 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index d0978b8b01..be009b54d8 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				顯示：
 			</text>
-			<check_box label="測試" name="show_world"/>
+			<check_box label="世界" name="show_world"/>
 			<check_box label="僅限可移動的" name="show_world_movables_only"/>
 			<check_box label="導航網面" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index 02d06323d4..e909a67e2c 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="預設" label_selected="預設" name="Default"/>
 	<button label="空白" label_selected="空白" name="Blank"/>
 	<button label="無" label_selected="無" name="None"/>
-	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="已停用預覽"/>
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
deleted file mode 100644
index 96caa7d333..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="語音聊天音量">
-	<slider label="語音聊天" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index aab5fa6028..81e0204262 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲試聽">
+<floater label="地點" name="voice_effects" title="語音變聲">
 	<string name="no_voice_effect">
 		（無變聲效果）
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
deleted file mode 100644
index 4260a8d331..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="音量">
-	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index eb7093a23c..cd069f9601 100644
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
-	<menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
+	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
deleted file mode 100644
index 507255d0c0..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="關閉交談" name="close_conversation"/>
-	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
-	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
-	<menu_item_call label="察看檔案" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
-	<menu_item_call label="語音通話" name="voice_call"/>
-	<menu_item_call label="聊天歷史……" name="chat_history"/>
-	<menu_item_call label="新增朋友" name="add_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friends"/>
-	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="地圖" name="map"/>
-	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_check label="禁止語音" name="block_unblock"/>
-	<menu_item_check label="禁止文字" name="MuteText"/>
-	<menu_item_call label="群組檔案" name="group_profile"/>
-	<menu_item_call label="啟用群組" name="activate_group"/>
-	<menu_item_call label="離開群組" name="leave_group"/>
-	<context_menu label="主持人選項" name="Moderator Options">
-		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
-		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
-		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
deleted file mode 100644
index 49e91417e8..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM…" name="IM"/>
-	<menu_item_call label="語音通話…" name="Call"/>
-	<menu_item_call label="開啟聊天歷史…" name="Chat history"/>
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
-	<menu_item_call label="加為朋友" name="add_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="邀請加入群組……" name="Invite"/>
-	<menu_item_call label="地圖" name="Map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
deleted file mode 100644
index 3fa99a5cd7..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="依名稱排序" name="sort_by_name"/>
-	<menu_item_check label="依日期排序" name="sort_by_date"/>
-	<menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
-	<menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
deleted file mode 100644
index 815b0b594c..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
-	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
-	<menu_item_call label="聊天歷史……" name="chat_history"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="地圖" name="map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="禁止語音" name="Block/Unblock"/>
-	<menu_item_check label="禁止文字" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
deleted file mode 100644
index a7006e524a..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="精簡視野" name="compact_view"/>
-	<menu_item_check label="全展視野" name="expanded_view"/>
-	<menu_item_check label="顯示時間" name="IMShowTime"/>
-	<menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index 9655732f2e..f4f93b0bdc 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="物件檔案..." name="Object Profile"/>
 	<menu_item_call label="封鎖…" name="Block"/>
-	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index 258d0d6b20..e85b4b7182 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="新頭髮" name="New Hair"/>
 		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="展開全部資料夾" name="expand"/>
-	<menu_item_call label="摺疊全部資料夾" name="collapse"/>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
deleted file mode 100644
index 8b35860eb6..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
-	<menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
-	<menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
-	<menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
-	<menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
-	<menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
-	<menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
-	<menu_item_check label="交談記錄……" name="Conversation"/>
-	<menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
-	<menu_item_check label="翻譯設定……" name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
deleted file mode 100644
index 9a2a3c403d..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="解除封鎖" name="unblock"/>
-	<menu_item_call label="檔案..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
deleted file mode 100644
index a8cecb4e14..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
-	<menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
deleted file mode 100644
index 5b70cd35bf..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="依名稱排序" name="sort_by_name"/>
-	<menu_item_check label="依類型排序" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
deleted file mode 100644
index 4251238fd9..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依狀態排序" name="sort_status"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看許可權限" name="view_permissions"/>
-	<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index b4b566f5ca..5768c554c9 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="語音通話" name="Call"/>
+	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="啟動" name="Activate"/>
 	<menu_item_call label="退出" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
deleted file mode 100644
index 05a30d938f..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index d25adaf8fb..38d5f3d324 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="察看檔案" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
-	<menu_item_call label="語音通話" name="voice_call"/>
-	<menu_item_call label="檢視聊天歷史……" name="chat_history"/>
-	<menu_item_call label="加為朋友" name="add_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="地圖" name="map"/>
-	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="加為朋友" name="Add Friend"/>
+	<menu_item_call label="移除朋友" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="地圖" name="Map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 69f0eab7dc..1380e0b307 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="加為朋友" name="add_friends"/>
-	<menu_item_call label="移除朋友" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="通話" name="call"/>
-	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+	<menu_item_call label="加為朋友" name="Add Friends"/>
+	<menu_item_call label="移除朋友" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
deleted file mode 100644
index 9bc5638472..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依距離排序" name="sort_distance"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看地圖" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
deleted file mode 100644
index 382234c3ec..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近排序" name="sort_most"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 72629822d4..592bb6561e 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="察看檔案" name="show_agent"/>
-	<menu_item_call label="送出 IM..." name="send_im"/>
-	<menu_item_call label="加為朋友..." name="add_friend"/>
+	<menu_item_call label="顯示居民檔案" name="show_agent"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index 9f3a9d58ff..b344b21c62 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="物件檔案..." name="show_object"/>
+	<menu_item_call label="顯示物件資訊" name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 09bdc57819..ac0e9e7e35 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
 			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="狀態" name="Status"/>
+		<menu label="狀態" name="Status">
+			<menu_item_call label="離開" name="Set Away"/>
+			<menu_item_call label="忙碌" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
 		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
 		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -27,18 +30,14 @@
 		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_check label="交談……" name="Conversations"/>
-		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
+		<menu_item_check label="聊天…" name="Nearby Chat"/>
 		<menu_item_check label="說話" name="Speak"/>
-		<menu label="語音變聲" name="VoiceMorphing">
-			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
-			<menu_item_check label="預覽……" name="Preview"/>
-			<menu_item_call label="訂閱……" name="Subscribe"/>
-		</menu>
+		<menu_item_check label="語音設定…" name="Nearby Voice"/>
+		<menu_item_check label="語音變聲…" name="ShowVoice"/>
 		<menu_item_check label="姿勢…" name="Gestures"/>
-		<menu_item_check label="朋友" name="My Friends"/>
-		<menu_item_check label="群組" name="My Groups"/>
-		<menu_item_check label="附近的人群" name="Active Speakers"/>
+		<menu_item_call label="朋友" name="My Friends"/>
+		<menu_item_call label="群組" name="My Groups"/>
+		<menu_item_call label="附近的人群" name="Active Speakers"/>
 		<menu_item_call label="封鎖清單" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -114,6 +113,7 @@
 			<menu_item_call label="購買" name="Menu Object Buy"/>
 			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
+			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
@@ -128,7 +128,6 @@
 			<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
-			<menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
@@ -158,13 +157,6 @@
 	<menu label="幫助" name="Help">
 		<menu_item_call label="簡易教學…" name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
-		<menu_item_call label="使用者指南" name="User’s guide"/>
-		<menu_item_call label="知識庫" name="Knowledge Base"/>
-		<menu_item_call label="維基" name="Wiki"/>
-		<menu_item_call label="社群論壇" name="Community Forums"/>
-		<menu_item_call label="支援入口" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
 		<menu_item_call label="違規舉報" name="Report Abuse"/>
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
@@ -391,14 +383,9 @@
 				<menu_item_call label="女性測試" name="Test Female"/>
 				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="動作速度" name="Animation Speed">
-				<menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/>
-				<menu_item_check label="慢動作" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
+			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
 			<menu_item_check label="顯示指向在" name="Show Point At"/>
 			<menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 59be26d43b..9fecf2c104 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -516,24 +516,6 @@
 		</url>
 		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
-
-    前往 [_URL] 察看是否有新版驅動程式？
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
-
-    前往 [_URL] 察看是否有新版驅動程式？
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=tw
-		</url>
-		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
-	</notification>
 	<notification name="UnknownGPU">
 		你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
 原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。  這大概不會出問題，但你可能需要調整顯像設定。
@@ -1554,13 +1536,10 @@ SHA1 指紋：[MD5_DIGEST]
 		此時無法發出交友邀請。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		「請勿打擾」模式目前是開啟狀態。  你將不會收到任何發給你的訊息通知。
-
-- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 &gt; 一般設定」）。
-- 所有瞬間傳送的邀請都將被婉拒。
-- 所有語音來電都將拒絕接聽。
-		<usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
+	<notification name="BusyModeSet">
+		已設為忙碌模式。
+聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。
+		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。
@@ -2045,10 +2024,6 @@ SHA1 指紋：[MD5_DIGEST]
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
 		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		新增一個人到現有的交談，等於建立新的交談。  所有交談者將會收到新交談通知。
-		<usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
 		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
@@ -2123,14 +2098,14 @@ SHA1 指紋：[MD5_DIGEST]
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
-		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
+	<notification label="忙碌模式警告" name="BusyModePay">
+		你現在處於忙碌模式，這意味著你付費後仍將不會收到任何物項。
 
-是否要在完成交易之前，先關閉「請勿打擾」模式？
+你是否要先離開忙碌模式，再完成交易？
 		<form name="form">
-			<ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/>
-			<button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
-			<button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
+			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
+			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
+			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2265,8 +2240,11 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="GroupNotice">
 		主旨：[SUBJECT]，訊息：[MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前在線上
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前離線
 	</notification>
 	<notification name="AddSelfFriend">
 		雖然你人很好，你還是不能把自己加為朋友。
@@ -2494,6 +2472,13 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="DynamicPathfindingDisabled">
 		這地區並未啟用動態尋徑。  使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		更改本地區的某些物件將導致其他移動物件的運作發生問題。  要使移動物件正常運作，請點按「重新產出地區」按鈕。  欲獲知詳情請選擇「幫助」。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		發生錯誤。  問題可能出在網路或伺服器，也可能因為你無權建製物件。  有時，只要登出再登入即能解決這類問題。
 		<usetemplate name="okbutton" yestext="確定"/>
@@ -2756,7 +2741,7 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ScriptQuestionCaution">
 		警告：物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。
   
-如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
+這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
 		<form name="form">
 			<button name="Grant" text="允許全權存取"/>
 			<button name="Deny" text="拒絕"/>
@@ -3338,633 +3323,4 @@ SHA1 指紋：[MD5_DIGEST]
 		你正在刪除 [NUM_ITEMS] 個物項。  你確定你要繼續？
 		<usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
-	</notification>
-	<notification name="YouFrozeAvatar">
-		化身已凍結。
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] 解除了對你的凍結。
-	</notification>
-	<notification name="AvatarUnFrozen">
-		化身已解除凍結。
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		凍結失敗，因為你在該地段沒有管理員權限。
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		你遭凍結的時間已過，請恢復正常活動。
-	</notification>
-	<notification name="AvatarCantFreeze">
-		抱歉，無法凍結該用戶。
-	</notification>
-	<notification name="NowOwnObject">
-		你現在是物件 [OBJECT_NAME] 的所有人
-	</notification>
-	<notification name="CantRezOnLand">
-		無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。  請用土地工具察看所有人。
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		無法產生物件，此刻要求數目過多。
-	</notification>
-	<notification name="SitFailCantMove">
-		你無法坐下，因為此刻你不能移動。
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		你不能坐下，因為該土地不允許。
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		請挨近一點。  無法坐在物件上，因為
-它和你不在同一個地區。
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		無法建立新物件。 地區已滿載。
-	</notification>
-	<notification name="FailedToPlaceObject">
-		無法將物件置於指定地點。  請再試一次。
-	</notification>
-	<notification name="NoOwnNoGardening">
-		你無法在別人的土地上建立樹和草。
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		複製失敗，你無權複製物件 &apos;[OBJ_NAME]&apos;。
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		選取了沒有根的重覆物件。
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		無法複製物件，因為地區滿載。
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		無法複製物件，找不到它們所在的地段。
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		無法建立物件，因為 
-地段滿載。
-	</notification>
-	<notification name="RezAttemptFailed">
-		試圖產生物件失敗。
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		無法建立已在此地區造成問題的物件。
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		該收納區物項已被列入黑名單。
-	</notification>
-	<notification name="NoCanRezObjects">
-		你此時無權建立物件。
-	</notification>
-	<notification name="LandSearchBlocked">
-		土地搜尋遭禁。
-你在短時間內進行了太多次土地搜尋。
-請稍候再試。
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		腳本資源不足，無法附著物件！
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		你已經死亡並且被瞬間傳送回你的家的位置
-	</notification>
-	<notification name="EjectComingSoon">
-		你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。
-	</notification>
-	<notification name="NoEnterServerFull">
-		你無法進入這地區，因為 
-伺服器滿載。
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		「儲存回收納區」功能已被停用。
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容，因為產生它的來源物件已不存在。
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		無法儲存 [OBJ_NAME] 到物件內容，你無權修改 &apos;[DEST_NAME]&apos; 物件。
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區，此動作已被停用。
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		無法複製你所選的，因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
-	</notification>
-	<notification name="NoTransNoCopy">
-		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		無法儲存你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		無法儲存你所選的，因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
-	</notification>
-	<notification name="NoModNoTaking">
-		無法拿取你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
-	</notification>
-	<notification name="RezDestInternalError">
-		內部錯誤：未知的目的地類型。
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		刪除失敗，因為找不到物件
-	</notification>
-	<notification name="SorryCantEjectUser">
-		抱歉，無法踢出該用戶。
-	</notification>
-	<notification name="RegionSezNotAHome">
-		此地區不許你在此設定「我的家」。
-	</notification>
-	<notification name="HomeLocationLimits">
-		你只能在自己的土地或大陸資訊中心上設定「我的家」。
-	</notification>
-	<notification name="HomePositionSet">
-		我的家位置已定。
-	</notification>
-	<notification name="AvatarEjected">
-		化身已被踢出。
-	</notification>
-	<notification name="AvatarEjectFailed">
-		踢出失敗，因為你在該地段沒有管理員權限。
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
- [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
- [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]）
-	</notification>
-	<notification name="NoPermModifyObject">
-		你無權變更該物件
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		對導航網面有貢獻的物件，無法啟用物理。
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		鍵格動畫物件無法啟用物理。
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		無法啟用物件的物理——土地資源不足。
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。
-	</notification>
-	<notification name="UnableAddItem">
-		無法新增項目！
-	</notification>
-	<notification name="UnableEditItem">
-		無法編輯這項目！
-	</notification>
-	<notification name="NoPermToEdit">
-		無權編輯這項目。
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		無權複製該收納區。
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		無法儲存到物件內容：該項目已不存在。
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		無法儲存到物件內容：收納區已存在同名稱的項目
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		無法儲存到物件內容：這麼做將修改附件的權限。
-	</notification>
-	<notification name="TooManyScripts">
-		腳本太多。
-	</notification>
-	<notification name="UnableAddScript">
-		無法新增腳本！
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		資產伺服器未在正常時間內反應。  物件已返交模擬器。
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		本地區未啟用物理形狀。
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		你無法變更跨越地區界限的導航網面。
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		該物件類型不得設定物理性質。
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		根幾何元件無法設成無形狀。
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		本地區未啟用物理材料。
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		只能調整根幾何元件的物理材料。
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		尚不支援角色設定物理材料。
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		指定的物理材料屬性中，至少有一個無效。
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		網面物件的縫合類型不得變更。
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		網面物件的形狀不得變更。
-	</notification>
-	<notification name="FullRegionCantEnter">
-		你無法進入這地區，\n因為地區滿載。
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		聯結失敗——所有人不同
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		聯結失敗——無法修改跨越地區界限的導航網面。
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		聯結失敗，你無權編輯。
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		聯結失敗——幾何元件太多
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		聯結失敗——沒有可聯結的東西。
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		聯結失敗——尋徑角色太多
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		聯結失敗——土地資源不足
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		物件使用了過多物理資源，其動態特性已被停用。
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
-	</notification>
-	<notification name="TeleportedByAttachment">
-		你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		無法建立要求的物件。 地區已滿載。
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		你不能將多個物件附著到同一個點。
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		你不能在此建立多個物件。
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		無法建立要求的物件。 物件在資料庫中找不到。
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		無法建立要求的物件。 要求逾時，無法完成。 請再試一次。
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		無法建立要求的物件。 請再試一次。
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		物件產生失敗，要求的物件載入時間太久。
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		無法將物件置於指定地點。  請再試一次。
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		你不得在這土地上建立植物。
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		無法恢復物件。 找不到虛擬世界的位置。
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		無法產生物件，它的網面資料無效。
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		無法產生物件，因為這地區已有太多的腳本。
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		你無權在此建立物件。
-	</notification>
-	<notification name="CantCreateObject">
-		你此時無權建立物件。
-	</notification>
-	<notification name="InvalidObjectParams">
-		無效的物件參數
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		你權限不夠，無法在此複製物件。
-	</notification>
-	<notification name="CantChangeShape">
-		你無權變更這個形狀。
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		你權限不夠，無法在此收取物件。
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		讓渡失敗，你無權為你的群組讓渡物件。
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		你權限不夠，無法在此購買物件。
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		無法附著物件，有個化身正坐在物件上。
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		樹和草不能當附件穿戴。
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		無法附著群組所擁有的物件。
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		無法附著不是你擁有的物件。
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		無法附著對導航網面有貢獻的物件。
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		無法附著物件，你無權移動該物件。
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		腳本資源不足，無法附著物件！
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		你無法在此卸除物件，請到「自由嘗試」區域再試。
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		卸除附件失敗：你無權在此處卸除。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		卸除附件失敗：可用土地資源不足。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		卸除附件失敗：可用資源不足。
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		無法在此卸除物件。  地段滿載。
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		無法觸摸/抓取此物件，因為你在該土地地段遭禁。
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		請將刪除參數範圍調小一點。
-	</notification>
-	<notification name="UnableToUploadAsset">
-		無法上傳資產。
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		找不到要瞬間傳送到家的用戶
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		要求神的權力失敗
-	</notification>
-	<notification name="GenericRequestFailed">
-		普通請求失敗
-	</notification>
-	<notification name="CantUploadPostcard">
-		無法上傳明信片。  請稍候再試一次。
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		無法取得群組通知的收納區細節。
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		無法送出群組通知——未准許。
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		無法送出群組通知——收納區建立失敗。
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		無法剖析通知裡的收納品項。
-	</notification>
-	<notification name="TerrainUploadFailed">
-		地形上傳失敗。
-	</notification>
-	<notification name="TerrainFileWritten">
-		地形檔案已寫入。
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		地形檔案已寫入，開始下載……
-	</notification>
-	<notification name="TerrainBaked">
-		地形已定貌。
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		你必須先更新瀏覽器後，才可購買這個地段。
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		無法購買，此地段不供出售。
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		無法購買，售價或土地面積已變。
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		你不是此地段的獲授權的買主。
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		你無法購買此地段，該地段已在等候批准購買
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		你不得在此建立物件，這麼做將導致地段超載。
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		未選取足夠租用地段，無法合併。
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
-	</notification>
-	<notification name="LandHasBeenDivided">
-		土地分割成功。
-	</notification>
-	<notification name="PassPurchased">
-		你購買了通行權。
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		地區不允許分類廣告。
-	</notification>
-	<notification name="LandPassExpireSoon">
-		你在此土地的通行權即將到期失效。
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		沒有合適的表面讓你坐下，請試一試別處。
-	</notification>
-	<notification name="CantSitNoRoom">
-		這裡沒有空間讓你坐下，請試試另一處。
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		收取物件失敗，因為你權限不足。
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		收取物件失敗，因為你 L$ 金額不足。
-	</notification>
-	<notification name="CantDeedGroupLand">
-		無法讓渡群組所擁有的土地。
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		購買物件失敗，你 L$ 金額不足。
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		購買收納區失敗，你 L$ 金額不足。
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		你的 L$ 不足，無法購買此土地的通行權。
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		此時無法購買通行權。  請稍候再試一次。
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		無法建立物件，\n地段滿載。
-	</notification>
-	<notification name="FailedPlacingObject">
-		無法將物件置於指定地點。  請再試一次。
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		無法為活動建立地標。
-	</notification>
-	<notification name="GodBeatsFreeze">
-		你擁有的神力解除了凍結！
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		要求特殊能力失敗。 該要求已載入記錄。
-	</notification>
-	<notification name="ExpireExplanation">
-		系統此時無法處理你的要求。 要求逾時，無法完成。
-	</notification>
-	<notification name="DieExplanation">
-		系統無法處理你的要求。
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		金額不足，無法建立幾何元件。
-	</notification>
-	<notification name="RezObjectFailure">
-		金額不足，無法建立物件。
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		已重設「我的家」位置，因為前一個位置不合法。
-	</notification>
-	<notification name="CantInviteRegionFull">
-		此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		此地區不許你在此設定「我的家」。
-	</notification>
-	<notification name="ListValidHomeLocations">
-		你只能在自己的土地或大陸資訊中心上設定「我的家」。
-	</notification>
-	<notification name="SetHomePosition">
-		我的家位置已定。
-	</notification>
-	<notification name="CantDerezInventoryError">
-		收納區出錯，無法收納物件。
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		無法建立要求的收納區。
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		無法建立要求的收納區資料夾。
-	</notification>
-	<notification name="CantCreateInventory">
-		無法建立該收納區。
-	</notification>
-	<notification name="CantCreateLandmark">
-		無法建立地標。
-	</notification>
-	<notification name="CantCreateOutfit">
-		此時無法建立裝扮。 請過一分鐘後再試。
-	</notification>
-	<notification name="InventoryNotForSale">
-		收納區沒有待售。
-	</notification>
-	<notification name="CantFindInvItem">
-		找不到收納區物項。
-	</notification>
-	<notification name="CantFindObject">
-		找不到物件。
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		此地區目前未啟用轉移金錢給物件的功能。
-	</notification>
-	<notification name="CantPayNoAgent">
-		無法決定付款給誰。
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		你無法將 L$ 送給公共物件。
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		針對虛擬世界物件建立收納區失敗。
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		發生內部錯誤，我們無法如常更新你的瀏覽器。  你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		無法建立和其他參與者發生交截的大型幾何元件。  請等其他參與者移開後再試。
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		這動作將刪除先前交談的記錄，和所有記錄備份。
-		<usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
-		<usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		無法移動檔案。 已恢復前一個路徑。
-		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index e0a49a0add..1c8b56b3d6 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
 	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
 	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
-	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 9f59bb32f8..1dfa024138 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="過濾器" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
-		<menu_button name="view_btn" tool_tip="排序選項"/>
-		<menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/>
-		<button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
-	</panel>
-	<block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
+	<text name="title_text">
+		封鎖清單
+	</text>
+	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
+	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
+	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
+	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
deleted file mode 100644
index 6524d41645..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="（載入中）"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
deleted file mode 100644
index 8446ce2130..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="包含語音交談"/>
-	<icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
-	<button name="delete_btn" tool_tip="移除此項目"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index fec4bb572a..175293cdf7 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
-	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 5f7aca387a..59ea7b70e2 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
+	<string name="people_filter_label" value="人員過濾器"/>
+	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
-		<panel label="朋友" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人員過濾器" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
-			</panel>
+		<panel label="我的朋友" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="群組" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="群組過濾器" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
-				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
-				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
+		<panel label="我的群組" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
+				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人員過濾器" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
-		<panel label="已封鎖的" name="blocked_panel">
-			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index e700e35516..cf2f81d313 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<panel>
-		<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-		<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			字型尺寸：
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="小" name="Small" value="0"/>
-			<item label="中" name="Medium" value="1"/>
-			<item label="大" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="聊天泡泡" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			通知
-		</text>
-		<text name="friend_ims">
-			朋友 IM：
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			非朋友 IM：
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="conference_ims">
-			多方交談 IM：
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="group_chat">
-			群組聊天：
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="nearby_chat">
-			附近的聊天：
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="notifications_alert">
-			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			播放聲音：
-		</text>
-		<check_box label="新交談" name="new_conversation"/>
-		<check_box label="語音通話來電" name="incoming_voice_call"/>
-		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
-		<check_box label="收納物品贈送" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="清空記錄……" name="clear_log"/>
-		<button label="刪除交談內容記錄……" name="delete_transcripts"/>
-		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		字型尺寸：
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="小" name="radio" value="0"/>
+		<radio_item label="中" name="radio2" value="1"/>
+		<radio_item label="大" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
+	<check_box label="聊天泡泡" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		顯示 IMs 於：
+	</text>
+	<text name="requires_restart_label">
+		（須重新啟動）
+	</text>
+	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
+		<radio_item label="分開視窗" name="radio" value="0"/>
+		<radio_item label="頁籤" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		啟用傳入聊天的突顯示視窗：
+	</text>
+	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
+	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
+	<spinner label="附近聊天內容提示框停駐時間：" name="nearby_toasts_lifetime"/>
+	<spinner label="附近聊天內容提示框消退時間：" name="nearby_toasts_fadingtime"/>
 	<button label="翻譯…" name="ok_btn"/>
 	<button label="自動取代…" name="autoreplace_showgui"/>
 	<button label="拼字檢查…" name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 044edbed70..7e67a0d02d 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		「請勿打擾」預設回應：
+		忙碌模式回應：
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 60f44a3d88..982dde4010 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="購買物件" name="Buyobject"/>
 			<combo_box.item label="支付物件" name="Payobject"/>
 			<combo_box.item label="打開" name="Open"/>
-			<combo_box.item label="縮放" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 31713ac281..7e17ed6864 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="AvatarAway">
 		離開
 	</string>
-	<string name="AvatarDoNotDisturb">
-		請勿打擾
+	<string name="AvatarBusy">
+		忙碌
 	</string>
 	<string name="AvatarMuted">
 		封鎖的
@@ -851,12 +851,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="ST_NO_JOINT">
 		找不到 ROOT 或旋軸。
 	</string>
-	<string name="NearbyChatTitle">
-		附近的聊天中
-	</string>
-	<string name="NearbyChatLabel">
-		（附近的聊天）
-	</string>
 	<string name="whisper">
 		低語：
 	</string>
@@ -920,15 +914,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ControlYourCamera">
 		控制你的攝影機
 	</string>
-	<string name="NotConnected">
-		未聯接
-	</string>
-	<string name="AgentNameSubst">
-		（你）
-	</string>
 	<string name="TeleportYourAgent">
 		瞬間傳送你本人
 	</string>
+	<string name="NotConnected">
+		未聯接
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -1010,6 +1001,18 @@ http://secondlife.com/viewer-access-faq
 	<string name="dictionary_files">
 		字典
 	</string>
+	<string name="AvatarSetNotAway">
+		非離開
+	</string>
+	<string name="AvatarSetAway">
+		離開
+	</string>
+	<string name="AvatarSetNotBusy">
+		非忙碌
+	</string>
+	<string name="AvatarSetBusy">
+		忙碌
+	</string>
 	<string name="shape">
 		體形
 	</string>
@@ -1978,8 +1981,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="PanelContentsNewScript">
 		新腳本
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		這居民處於「請勿打擾」狀態，不會立即看到你的訊息。
+	<string name="BusyModeResponseDefault">
+		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
 	</string>
 	<string name="MuteByName">
 		（按名稱）
@@ -2092,6 +2095,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		內容
+	</string>
 	<string name="AcquiredItems">
 		取得物品
 	</string>
@@ -3863,7 +3869,7 @@ http://secondlife.com/viewer-access-faq
 		一般普級地區
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		這地段外的其他化身，看不見也聽不到位於地段裡的化身
+		可看到本地段外的化身，並與之交談
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地區重新產出之前，可移動物件可能無法正常運作。
@@ -3940,12 +3946,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="IM_unblock_only_groups_friends">
 		要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
 	</string>
-	<string name="OnlineStatus">
-		上線
-	</string>
-	<string name="OfflineStatus">
-		離線
-	</string>
 	<string name="answered_call">
 		你的通話已經接通
 	</string>
@@ -3955,9 +3955,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="you_joined_call">
 		你發起了語音通話
 	</string>
-	<string name="you_auto_rejected_call-im">
-		因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。
-	</string>
 	<string name="name_started_call">
 		[NAME] 發起了語音通話
 	</string>
@@ -3974,7 +3971,7 @@ http://secondlife.com/viewer-access-faq
 		聯接中...
 	</string>
 	<string name="conference-title">
-		多人聊天
+		臨時多方通話
 	</string>
 	<string name="conference-title-incoming">
 		和 [AGENT_NAME] 多方通話
@@ -4866,9 +4863,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Label">
 		聊天
 	</string>
-	<string name="Command_Conversations_Label">
-		交談
-	</string>
 	<string name="Command_Compass_Label">
 		羅盤
 	</string>
@@ -4944,9 +4938,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Tooltip">
 		透過文字和附近人們聊天
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		和所有人交談
-	</string>
 	<string name="Command_Compass_Tooltip">
 		指南針
 	</string>
@@ -5076,13 +5067,4 @@ http://secondlife.com/viewer-access-faq
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
-	</string>
 </strings>
-- 
cgit v1.2.3


From 774277e9cf3b6b55c7aaaa9dadfe2ef2ddb0b0c2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:56:53 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 (based on latest merge with viewer-development)

---
 .../default/xui/de/floater_conversation_log.xml    |   8 +
 .../xui/de/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/de/floater_im_container.xml  |  29 +-
 .../skins/default/xui/de/floater_im_session.xml    |  61 +-
 .../skins/default/xui/de/floater_incoming_call.xml |  10 +-
 .../default/xui/de/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/de/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/de/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/de/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/de/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/de/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/de/menu_conversation.xml     |  31 +
 .../default/xui/de/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/de/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/de/menu_im_conversation.xml  |  15 +
 .../default/xui/de/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/de/menu_object_icon.xml      |   2 +
 .../skins/default/xui/de/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/de/menu_participant_view.xml |  13 +
 .../default/xui/de/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/de/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/de/menu_people_blocked_view.xml    |   5 +
 .../default/xui/de/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/de/menu_people_groups.xml    |   2 +-
 .../default/xui/de/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/de/menu_people_nearby.xml    |  23 +-
 .../xui/de/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/de/menu_people_nearby_view.xml     |   8 +
 .../default/xui/de/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/de/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/de/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/de/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/de/panel_avatar_list_item.xml      |   1 +
 .../default/xui/de/panel_block_list_sidetray.xml   |  15 +-
 .../xui/de/panel_conversation_list_item.xml        |   8 +
 .../xui/de/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/de/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/de/panel_people.xml  |  88 +--
 .../default/xui/de/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/de/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/de/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/de/strings.xml     |  68 +-
 .../default/xui/es/floater_conversation_log.xml    |   8 +
 .../xui/es/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/es/floater_im_container.xml  |  29 +-
 .../skins/default/xui/es/floater_im_session.xml    |  61 +-
 .../skins/default/xui/es/floater_incoming_call.xml |  10 +-
 .../default/xui/es/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/es/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/es/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/es/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/es/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/es/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/es/menu_conversation.xml     |  31 +
 .../default/xui/es/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/es/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/es/menu_im_conversation.xml  |  15 +
 .../default/xui/es/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/es/menu_object_icon.xml      |   2 +
 .../skins/default/xui/es/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/es/menu_participant_view.xml |  13 +
 .../default/xui/es/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/es/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/es/menu_people_blocked_view.xml    |   5 +
 .../default/xui/es/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/es/menu_people_groups.xml    |   2 +-
 .../default/xui/es/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/es/menu_people_nearby.xml    |  23 +-
 .../xui/es/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/es/menu_people_nearby_view.xml     |   8 +
 .../default/xui/es/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/es/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/es/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml |  35 +-
 .../newview/skins/default/xui/es/notifications.xml | 692 ++++++++++++++++++++-
 .../default/xui/es/panel_avatar_list_item.xml      |   1 +
 .../default/xui/es/panel_block_list_sidetray.xml   |  15 +-
 .../xui/es/panel_conversation_list_item.xml        |   8 +
 .../xui/es/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/es/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/es/panel_people.xml  |  88 +--
 .../default/xui/es/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/es/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/es/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/es/strings.xml     |  63 +-
 .../default/xui/fr/floater_conversation_log.xml    |   8 +
 .../xui/fr/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/fr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/fr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/fr/floater_incoming_call.xml |  10 +-
 .../default/xui/fr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/fr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/fr/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/fr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/fr/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/fr/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/fr/menu_conversation.xml     |  31 +
 .../default/xui/fr/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/fr/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/fr/menu_im_conversation.xml  |  15 +
 .../default/xui/fr/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/fr/menu_object_icon.xml      |   2 +
 .../skins/default/xui/fr/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/fr/menu_participant_view.xml |  13 +
 .../default/xui/fr/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/fr/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/fr/menu_people_blocked_view.xml    |   5 +
 .../default/xui/fr/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/fr/menu_people_groups.xml    |   2 +-
 .../default/xui/fr/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/fr/menu_people_nearby.xml    |  23 +-
 .../xui/fr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/fr/menu_people_nearby_view.xml     |   8 +
 .../default/xui/fr/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/fr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/fr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/fr/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/fr/panel_avatar_list_item.xml      |   1 +
 .../default/xui/fr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/fr/panel_conversation_list_item.xml        |   8 +
 .../xui/fr/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/fr/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/fr/panel_people.xml  |  88 +--
 .../default/xui/fr/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/fr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/fr/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/fr/strings.xml     |  68 +-
 .../default/xui/it/floater_conversation_log.xml    |   8 +
 .../xui/it/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/it/floater_im_container.xml  |  29 +-
 .../skins/default/xui/it/floater_im_session.xml    |  61 +-
 .../skins/default/xui/it/floater_incoming_call.xml |  10 +-
 .../default/xui/it/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/it/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/it/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/it/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/it/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/it/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/it/menu_conversation.xml     |  31 +
 .../default/xui/it/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/it/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/it/menu_im_conversation.xml  |  15 +
 .../default/xui/it/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/it/menu_object_icon.xml      |   2 +
 .../skins/default/xui/it/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/it/menu_participant_view.xml |  13 +
 .../default/xui/it/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/it/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/it/menu_people_blocked_view.xml    |   5 +
 .../default/xui/it/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/it/menu_people_groups.xml    |   2 +-
 .../default/xui/it/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/it/menu_people_nearby.xml    |  23 +-
 .../xui/it/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/it/menu_people_nearby_view.xml     |   8 +
 .../default/xui/it/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/it/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/it/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/it/notifications.xml | 692 ++++++++++++++++++++-
 .../default/xui/it/panel_avatar_list_item.xml      |   1 +
 .../default/xui/it/panel_block_list_sidetray.xml   |  15 +-
 .../xui/it/panel_conversation_list_item.xml        |   8 +
 .../xui/it/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/it/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/it/panel_people.xml  |  88 +--
 .../default/xui/it/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/it/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/it/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/it/strings.xml     |  63 +-
 .../default/xui/ja/floater_conversation_log.xml    |   8 +
 .../xui/ja/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/ja/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ja/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |  10 +-
 .../default/xui/ja/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/ja/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |  31 +
 .../default/xui/ja/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/ja/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/ja/menu_im_conversation.xml  |  15 +
 .../default/xui/ja/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/ja/menu_object_icon.xml      |   2 +
 .../skins/default/xui/ja/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/ja/menu_participant_view.xml |  13 +
 .../default/xui/ja/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/ja/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/ja/menu_people_blocked_view.xml    |   5 +
 .../default/xui/ja/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/ja/menu_people_groups.xml    |   2 +-
 .../default/xui/ja/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/ja/menu_people_nearby.xml    |  23 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |   8 +
 .../default/xui/ja/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/ja/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/ja/notifications.xml | 686 +++++++++++++++++++-
 .../default/xui/ja/panel_avatar_list_item.xml      |   1 +
 .../default/xui/ja/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ja/panel_conversation_list_item.xml        |   8 +
 .../xui/ja/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/ja/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/ja/panel_people.xml  |  90 +--
 .../default/xui/ja/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/ja/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/ja/strings.xml     |  68 +-
 .../default/xui/pt/floater_conversation_log.xml    |   8 +
 .../xui/pt/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/pt/floater_im_container.xml  |  29 +-
 .../skins/default/xui/pt/floater_im_session.xml    |  61 +-
 .../skins/default/xui/pt/floater_incoming_call.xml |   8 +-
 .../default/xui/pt/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/pt/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/pt/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/pt/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/pt/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/pt/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/pt/menu_conversation.xml     |  31 +
 .../default/xui/pt/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/pt/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/pt/menu_im_conversation.xml  |  15 +
 .../default/xui/pt/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/pt/menu_object_icon.xml      |   2 +
 .../skins/default/xui/pt/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/pt/menu_participant_view.xml |  13 +
 .../default/xui/pt/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/pt/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/pt/menu_people_blocked_view.xml    |   5 +
 .../default/xui/pt/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/pt/menu_people_groups.xml    |   2 +-
 .../default/xui/pt/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/pt/menu_people_nearby.xml    |  23 +-
 .../xui/pt/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/pt/menu_people_nearby_view.xml     |   8 +
 .../default/xui/pt/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/pt/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/pt/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/pt/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/pt/panel_avatar_list_item.xml      |   1 +
 .../default/xui/pt/panel_block_list_sidetray.xml   |  15 +-
 .../xui/pt/panel_conversation_list_item.xml        |   8 +
 .../xui/pt/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/pt/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/pt/panel_people.xml  |  88 +--
 .../default/xui/pt/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/pt/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/pt/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/pt/strings.xml     |  63 +-
 .../default/xui/ru/floater_conversation_log.xml    |   8 +
 .../xui/ru/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/ru/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ru/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ru/floater_incoming_call.xml |  10 +-
 .../default/xui/ru/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ru/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ru/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/ru/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ru/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/ru/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/ru/menu_conversation.xml     |  31 +
 .../default/xui/ru/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/ru/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/ru/menu_im_conversation.xml  |  15 +
 .../default/xui/ru/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/ru/menu_object_icon.xml      |   2 +
 .../skins/default/xui/ru/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/ru/menu_participant_view.xml |  13 +
 .../default/xui/ru/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/ru/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/ru/menu_people_blocked_view.xml    |   5 +
 .../default/xui/ru/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/ru/menu_people_groups.xml    |   2 +-
 .../default/xui/ru/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/ru/menu_people_nearby.xml    |  23 +-
 .../xui/ru/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ru/menu_people_nearby_view.xml     |   8 +
 .../default/xui/ru/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/ru/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ru/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/ru/notifications.xml | 689 +++++++++++++++++++-
 .../default/xui/ru/panel_avatar_list_item.xml      |   1 +
 .../default/xui/ru/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ru/panel_conversation_list_item.xml        |   8 +
 .../xui/ru/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/ru/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/ru/panel_people.xml  |  88 +--
 .../default/xui/ru/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/ru/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ru/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/ru/strings.xml     |  66 +-
 .../default/xui/tr/floater_conversation_log.xml    |   8 +
 .../xui/tr/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/tr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/tr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/tr/floater_incoming_call.xml |  10 +-
 .../default/xui/tr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/tr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/tr/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/tr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/tr/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/tr/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/tr/menu_conversation.xml     |  31 +
 .../default/xui/tr/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/tr/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/tr/menu_im_conversation.xml  |  15 +
 .../default/xui/tr/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/tr/menu_object_icon.xml      |   2 +
 .../skins/default/xui/tr/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/tr/menu_participant_view.xml |  13 +
 .../default/xui/tr/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/tr/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/tr/menu_people_blocked_view.xml    |   5 +
 .../default/xui/tr/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/tr/menu_people_groups.xml    |   2 +-
 .../default/xui/tr/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/tr/menu_people_nearby.xml    |  23 +-
 .../xui/tr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/tr/menu_people_nearby_view.xml     |   8 +
 .../default/xui/tr/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/tr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/tr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/tr/notifications.xml | 683 +++++++++++++++++++-
 .../default/xui/tr/panel_avatar_list_item.xml      |   1 +
 .../default/xui/tr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/tr/panel_conversation_list_item.xml        |   8 +
 .../xui/tr/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/tr/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/tr/panel_people.xml  |  88 +--
 .../default/xui/tr/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/tr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/tr/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/tr/strings.xml     |  68 +-
 .../default/xui/zh/floater_conversation_log.xml    |   8 +
 .../xui/zh/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/zh/floater_im_container.xml  |  29 +-
 .../skins/default/xui/zh/floater_im_session.xml    |  61 +-
 .../skins/default/xui/zh/floater_incoming_call.xml |   8 +-
 .../default/xui/zh/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/zh/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/zh/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/zh/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/zh/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/zh/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/zh/menu_conversation.xml     |  31 +
 .../default/xui/zh/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/zh/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/zh/menu_im_conversation.xml  |  15 +
 .../default/xui/zh/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/zh/menu_object_icon.xml      |   2 +
 .../skins/default/xui/zh/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/zh/menu_participant_view.xml |  13 +
 .../default/xui/zh/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/zh/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/zh/menu_people_blocked_view.xml    |   5 +
 .../default/xui/zh/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/zh/menu_people_groups.xml    |   2 +-
 .../default/xui/zh/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/zh/menu_people_nearby.xml    |  23 +-
 .../xui/zh/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/zh/menu_people_nearby_view.xml     |   8 +
 .../default/xui/zh/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/zh/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/zh/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  37 +-
 .../newview/skins/default/xui/zh/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/zh/panel_avatar_list_item.xml      |   1 +
 .../default/xui/zh/panel_block_list_sidetray.xml   |  15 +-
 .../xui/zh/panel_conversation_list_item.xml        |   8 +
 .../xui/zh/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/zh/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/zh/panel_people.xml  |  88 +--
 .../default/xui/zh/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/zh/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/zh/strings.xml     |  66 +-
 387 files changed, 10359 insertions(+), 1715 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
new file mode 100644
index 0000000000..19620a0fc9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL">
+	<panel name="buttons_panel">
+		<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
new file mode 100644
index 0000000000..010ad19076
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="UNTERHALTUNG:">
+	<floater.string name="Title">
+		UNTERHALTUNG: [NAME]
+	</floater.string>
+	<text name="page_label" value="Seite"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 95eda97938..5bf916c8e9 100644
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="GESPRÄCHE"/>
+<multi_floater name="floater_im_box" title="GESPRÄCHE">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+					<button name="add_btn" tool_tip="Neue Unterhaltung starten"/>
+					<button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/>
+					<text name="stub_textbox">
+						Diese Unterhaltung erscheint in einem separaten Fenster.   [secondlife:/// Zurückholen.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index abaf275651..f96eb72cb1 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="An" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/>
+	<floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/>
+	<floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/>
+	<floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/>
+	<floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/>
+	<floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/>
+				<button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/>
+				<button name="close_btn" tool_tip="Diese Unterhaltung beenden"/>
+				<button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="An" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index 213d9f54f5..f13842f479 100644
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		Anonym
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ruft an.
+		ruft Sie an.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ist einem Voice-Konferenz-Chat beigetreten.
@@ -25,9 +25,9 @@
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
-		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
+		Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet.
 	</text>
-	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
-	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
-	<button label="IM starten" name="Start IM"/>
+	<button label="Annehmen" label_selected="Annehmen" name="Accept"/>
+	<button label="Ignorieren" label_selected="Ignorieren" name="Reject"/>
+	<button label="Stattdessen IM öffnen" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index ebf8f01632..88e9f53a4c 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Anzeigen:
 			</text>
-			<check_box label="Welt" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 9585622516..b794d879f0 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Leer" label_selected="Leer" name="Blank"/>
 	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Live-Vorschau" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vorschau deaktiviert"/>
 	<filter_editor label="Texturen filtern" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..15259639e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE">
+	<slider label="Voice-Chat" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 413a46525c..8d37950480 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE MORPHING">
+<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
new file mode 100644
index 0000000000..258627c94f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="LAUTSTÄRKE">
+	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
index 54b218d22f..2dd871b2ea 100644
--- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
-	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
new file mode 100644
index 0000000000..30d3ab79e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
+	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
+	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Voice ignorieren" name="block_unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+	<menu_item_call label="Gruppenprofil" name="group_profile"/>
+	<menu_item_call label="Gruppe aktivieren" name="activate_group"/>
+	<menu_item_call label="Gruppe verlassen" name="leave_group"/>
+	<context_menu label="Moderatoroptionen" name="Moderator Options">
+		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
+		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
+		<menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..2ef8762128
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Voice-Anruf..." name="Call"/>
+	<menu_item_call label="Chatverlauf öffnen..." name="Chat history"/>
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="Invite"/>
+	<menu_item_call label="Karte" name="Map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..ae3cc5bc97
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
+	<menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/>
+	<menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
new file mode 100644
index 0000000000..875524b19d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..48f62d29a1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Kompaktansicht" name="compact_view"/>
+	<menu_item_check label="Erweiterte Ansicht" name="expanded_view"/>
+	<menu_item_check label="Zeit anzeigen" name="IMShowTime"/>
+	<menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index 8b6c558416..f92fa0f82b 100644
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Objektprofil..." name="Object Profile"/>
 	<menu_item_call label="Ignorieren..." name="Block"/>
+	<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
+	<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index d56c93533c..0cf3c09882 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Neues Haar" name="New Hair"/>
 		<menu_item_call label="Neue Augen" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Alle Ordner erweitern" name="expand"/>
+	<menu_item_call label="Alle Ordner schließen" name="collapse"/>
 	<menu_item_call label="Outfit neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml
new file mode 100644
index 0000000000..6ceb9ac4c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/>
+	<menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/>
+	<menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/>
+	<menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/>
+	<menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/>
+	<menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/>
+	<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/>
+	<menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/>
+	<menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..f69a453e58
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Nicht mehr ignorieren" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..041fde139d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/>
+	<menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..1dae593ebe
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Typ sortieren" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
new file mode 100644
index 0000000000..da4890fe96
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
+	<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
index 76225ba241..a69c82d3d8 100644
--- a/indra/newview/skins/default/xui/de/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Info anzeigen" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Voice-Anruf" name="Call"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Verlassen" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
new file mode 100644
index 0000000000..20386bba56
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index 1db964357f..cdbb3ae917 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Karte" name="Map"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index b6e99edfe1..ba6578e2d1 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
-	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Anrufen" name="call"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..d38ec65037
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Karte anzeigen" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a116ad0bc1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach jüngsten sortieren" name="sort_most"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index 9a808088fb..c61ebb0eae 100644
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
+	<menu_item_call label="Profil anzeigen" name="show_agent"/>
+	<menu_item_call label="IM senden..." name="send_im"/>
+	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 90d3763d9c..77b7004e44 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
+	<menu_item_call label="Objektprofil..." name="show_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 845df1f050..2c9d9fa7f1 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status">
-			<menu_item_call label="Abwesend" name="Set Away"/>
-			<menu_item_call label="Beschäftigt" name="Set Busy"/>
-		</menu>
+		<menu label="Status" name="Status"/>
 		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
 		<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
 		<menu_item_call label="Kontoübersicht..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
+		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
-		<menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/>
-		<menu_item_check label="Voice-Morphing..." name="ShowVoice"/>
+		<menu label="Voice-Morphing" name="VoiceMorphing">
+			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
+			<menu_item_check label="Vorschau..." name="Preview"/>
+			<menu_item_call label="Abonnieren..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesten..." name="Gestures"/>
-		<menu_item_call label="Freunde" name="My Friends"/>
-		<menu_item_call label="Gruppen" name="My Groups"/>
-		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_check label="Freunde" name="My Friends"/>
+		<menu_item_check label="Gruppen" name="My Groups"/>
+		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
 	</menu>
 	<menu label="Welt" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Kaufen" name="Menu Object Buy"/>
 			<menu_item_call label="Nehmen" name="Menu Object Take"/>
 			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
-			<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Objekt zurückgeben" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
+		<menu_item_call label="Benutzerhandbuch" name="User’s guide"/>
+		<menu_item_call label="Knowledge Base" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Community-Foren" name="Community Forums"/>
+		<menu_item_call label="Support-Portal" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
@@ -385,9 +393,14 @@
 				<menu_item_call label="Weiblich testen" name="Test Female"/>
 				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Animationsgeschwindigkeit" name="Animation Speed">
+				<menu_item_call label="Alle Animationen 10 % schneller" name="All Animations 10 Faster"/>
+				<menu_item_call label="Alle Animationen 10 % langsamer" name="All Animations 10 Slower"/>
+				<menu_item_call label="Alle Animationsgeschwindigkeiten zurücksetzen" name="Reset All Animation Speed"/>
+				<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
 			<menu_item_check label="Animations-Info" name="Animation Info"/>
-			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
 			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
 			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
 			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 4b7a60b4eb..dc0d7dc6b4 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -523,6 +523,24 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://support.amd.com/de/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=de-de
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -1558,10 +1576,13 @@ Diese Gruppe verlassen?
 		Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Beschäftigt-Modus ist aktiviert.
-Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben.
-		<usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Nicht-stören-Modus ist aktiviert:  Sie erhalten keine Benachrichtigung über eingehende Kommunikation.
+
+- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen &gt; Allgemein).
+- Teleport-Angebote werden abgelehnt.
+- Voice-Anrufe werden abgelehnt.
+		<usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab.
@@ -2049,6 +2070,10 @@ Inventarobjekt(e) verschieben?
 		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt.  Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen.
+		<usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Wirklich beenden?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
@@ -2122,14 +2147,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
 			<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
-	<notification label="Beschäftigt-Modus-Warnung" name="BusyModePay">
-		Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
+	<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
+		Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
 
-Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
+Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/>
-			<button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/>
-			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
+			<ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/>
+			<button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/>
+			<button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2264,11 +2289,8 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 	<notification name="GroupNotice">
 		Betreff: [SUBJECT], Nachricht: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
@@ -2496,13 +2518,6 @@ Fliegen ist hier nicht möglich.
 	<notification name="DynamicPathfindingDisabled">
 		Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt. Um dieses Problem zu beheben, klicken Sie auf die Schaltfläche „Region neu formen“. Um weitere Informationen zu erhalten, klicken Sie auf „Hilfe“.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Hilfe" ignoretext="Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2765,7 +2780,7 @@ Ist das OK?
 	<notification name="ScriptQuestionCaution">
 		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
   
-Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
+Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
 			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
@@ -3346,4 +3361,633 @@ Versuch abgebrochen.
 		Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen?
 		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar eingefroren.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] hat Sie aufgetaut.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar aufgetaut.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Sie sind nicht mehr eingefroren und können sich frei bewegen.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Dieser Benutzer kann nicht eingefroren werden.
+	</notification>
+	<notification name="NowOwnObject">
+		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen.
+	</notification>
+	<notification name="SitFailCantMove">
+		Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Kommen Sie näher heran.  Sitzen auf Objekt nicht möglich, da
+es sich nicht in der gleichen Region befindet wie Sie.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Neues Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Ohne ausgewählte Hauptobjekte duplizieren.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Objekte können nicht dupliziert werden, da die Region voll ist.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Objekt kann nicht erstellt werden, da 
+die Parzelle voll ist.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Versuch zum Rezzen eines Objekts fehlgeschlagen.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Dieses Inventarobjekt ist auf der schwarzen Liste.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Landsuche blockiert.
+Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt.
+Warten Sie kurz und versuchen Sie es noch einmal.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sie sind gestorben und wurden nach Hause teleportiert
+	</notification>
+	<notification name="EjectComingSoon">
+		Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Sie können diese Region nicht betreten, da 
+der Server voll ist.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Erneutes Speichern im Inventar ist deaktiviert.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		„[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann.
+	</notification>
+	<notification name="NoModNoTaking">
+		Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="RezDestInternalError">
+		Interner Fehler: Unbekannter Zielttyp.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Löschen fehlgeschlagen, da Objekt nicht gefunden wurde
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Dieser Benutzer kann nicht hinausgeworfen werden.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="HomePositionSet">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar hinausgeworfen.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Physik für Keyframe-Objekte kann nicht aktiviert werden.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden.
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt.
+	</notification>
+	<notification name="UnableAddItem">
+		Objekt konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="UnableEditItem">
+		Kein Bearbeiten möglich.
+	</notification>
+	<notification name="NoPermToEdit">
+		Bearbeiten nicht gestattet.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Kopieren dieses Inventars nicht gestattet.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
+	</notification>
+	<notification name="TooManyScripts">
+		Zu viele Skripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Skript konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Asset-Server hat nicht rechtzeitig reagiert.  Objekt wurde zum Sim zurückübertragen.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In dieser Region sind keine Physikformen aktiviert.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Sie können das Navmesh nicht regionsübergreifend modifizieren.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Hauptprim kann nicht auf formlos eingestellt werden.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In dieser Region sind keine Physikmaterialien aktiviert.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Nur bei Hauptprims können die Physikmaterialien angepasst werden.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Sie können den Nahttyp eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Sie können die Form eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Sie können diese Region nicht betreten, \nda die Region voll ist.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Verknüpfungsfehler – Eigentümer sind unterschiedlich
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Verknüpfungsfehler – zu viele Primitive
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Verknüpfungsfehler – nichts zum Verknüpfen vorhanden.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Verknüpfungsfehler – zu viele Pathfinding-Figuren
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Verknüpfungsfehler – nicht genügend Landressourcen
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert.
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sie wurden von einem Anhang an [ITEM_ID] teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Sie können hier nicht mehrere Objekte erstellen.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Objekt konnte nicht an angegebenem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Auf diesem Land können keine Pflanzen erstellt werden.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantCreateObject">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Ungültige Objektparameter
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantChangeShape">
+		Sie können diese Form nicht ändern.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Bäume und Gräser können nicht als Anhänge getragen werden.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Objekte im Gruppenbesitz können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Objekte, die Ihnen nicht gehören, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Objekte, die zum Navmesh beitragen, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Objekt kann nicht hier abgelegt werden.  Die Parzelle ist voll.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Grenzen Sie Ihre Löschparameter ein.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Asset kann nicht hochgeladen werden.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Keinen Benutzer zum Teleportieren nach Hause gefunden
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		Anforderdung nach übernatürlichen Kräften fehlgeschlagen
+	</notification>
+	<notification name="GenericRequestFailed">
+		generische Anforderdung fehlgeschlagen
+	</notification>
+	<notification name="CantUploadPostcard">
+		Postkarte kann nicht hochgeladen werden.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Inventardetails für Gruppenmitteilung kann nicht abgerufen werden.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Inventar in Mitteilung kann nicht geparst werden.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Fehler beim Hochladen von Terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Terraindatei geschrieben.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Terraindatei geschrieben, Download beginnt...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain geformt.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Sie sind nicht der autorisierte Käufer dieser Parzelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -&gt; „Fehler melden“...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Land wurde geteilt.
+	</notification>
+	<notification name="PassPurchased">
+		Sie haben einen Pass gekauft.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Region lässt keine Werbung zu.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ihr Pass für dieses Land läuft demnächst ab.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Land in Gruppenbesitz kann nicht übertragen werden.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Passkauf momentan nicht möglich.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Objekt kann nicht erstellt werden, \nda die Parzelle voll ist.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Landmarke für dieses Ereignis kann nicht erstellt werden.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Ihre übernatürlichen Kräfte heben das Einfrieren auf!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert.
+	</notification>
+	<notification name="ExpireExplanation">
+		Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung.
+	</notification>
+	<notification name="DieExplanation">
+		Das System kann Ihre Anfrage nicht verarbeiten.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Sie haben nicht genügend Geld, um Primitive zu erstellen.
+	</notification>
+	<notification name="RezObjectFailure">
+		Sie haben nicht genügend Geld, um Objekt zu erstellen.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Zuhause-Position neu festlegen, da Zuhause nicht zulässig war.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="SetHomePosition">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Angefordertes Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Angeforderter Inventarordner kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateInventory">
+		Dieses Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Landmarke kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Inventar steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantFindInvItem">
+		Inventarobjekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantFindObject">
+		Objekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Nicht ersichtlich, wer bezahlt werden muss.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Sie können öffentlichen Objekten keine L$ geben.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Inventarerstellung für Inworld-Objekt fehlgeschlagen.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden.  Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden.  Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht.
+		<usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht.
+		<usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt.
+		<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
index dcfcffa6e2..79a2ebe9df 100644
--- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/>
 	<icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/>
 	<icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index 2d140515d4..c105a5b8a3 100644
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel" width="300">
-	<text left_pad="5" name="title_text" width="260">
-		Liste der ignorierten Einwohner
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
-	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
-	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
-	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtern" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/>
+		<menu_button name="view_btn" tool_tip="Sortieroptionen"/>
+		<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
+		<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..a9bfe4754e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(laden)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..afeaa14e81
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/>
+	<icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/>
+	<button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
index d097a2b18c..fc911a64df 100644
--- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Unbekannt"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 4e76147746..8c05ca2c24 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -14,81 +14,53 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_filtered_friends_msg">
 		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche].
 	</string>
-	<string name="people_filter_label" value="Nach Leuten filtern"/>
-	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
 	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
-	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
-		<panel label="MEINE FREUNDE" name="friends_panel">
+		<panel label="FREUNDE" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEINE GRUPPEN" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Optionen"/>
-				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
-				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
+		<panel label="GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/>
+				<menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
 			</panel>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
+		<panel label="IGNORIERT" name="blocked_panel">
+			<panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index c9ae350147..8193fd42c1 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<text name="font_size">
-		Schriftgröße:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Klein" name="radio" value="0"/>
-		<radio_item label="Mittel" name="radio2" value="1"/>
-		<radio_item label="Groß" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
-	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
-	<check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
-	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IMs anzeigen in:
-	</text>
-	<text name="requires_restart_label">
-		(Neustart erforderlich)
-	</text>
-	<radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich).">
-		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
-		<radio_item label="Registerkarten" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Popups für eingehende Chats aktivieren:
-	</text>
-	<check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/>
-	<check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/>
-	<spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/>
-	<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
+		<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Schriftgröße:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Klein" name="Small" value="0"/>
+			<item label="Mittel" name="Medium" value="1"/>
+			<item label="Groß" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Benachrichtigungen
+		</text>
+		<text name="friend_ims">
+			IMs von Freunden:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IMs von anderen:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			Konferenz-IMs:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Gruppen-Chat:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat in der Nähe:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Sound abspielen:
+		</text>
+		<check_box label="Neue Unterhaltung" name="new_conversation"/>
+		<check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
+		<check_box label="Teleport-Angebot" name="teleport_offer"/>
+		<check_box label="Inventarangebot" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Protokoll löschen..." name="clear_log"/>
+		<button label="Protokolle löschen..." name="delete_transcripts"/>
+		<button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
+	</panel>
 	<button label="Übersetzen..." name="ok_btn"/>
 	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
 	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 979ccba48d..4e453b6969 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Antwort, wenn im „Beschäftigt“-Modus:
+		Nicht-stören-Antwort:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 4c8d77d336..29239033fe 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
+			<combo_box.item label="Zoomen" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 79cb73ecf9..e142cb8029 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=de-DE&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
@@ -622,8 +622,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AvatarAway">
 		Abwesend
 	</string>
-	<string name="AvatarBusy">
-		Beschäftigt
+	<string name="AvatarDoNotDisturb">
+		Nicht stören
 	</string>
 	<string name="AvatarMuted">
 		Ignoriert
@@ -859,6 +859,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat in der Nähe
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat in der Nähe)
+	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
@@ -922,12 +928,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
-	<string name="TeleportYourAgent">
-		Sie teleportieren
-	</string>
 	<string name="NotConnected">
 		Nicht verbunden
 	</string>
+	<string name="AgentNameSubst">
+		(Sie)
+	</string>
+	<string name="TeleportYourAgent">
+		Sie teleportieren
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1009,18 +1018,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="dictionary_files">
 		Wörterbücher
 	</string>
-	<string name="AvatarSetNotAway">
-		Nicht abwesend
-	</string>
-	<string name="AvatarSetAway">
-		Abwesend
-	</string>
-	<string name="AvatarSetNotBusy">
-		Nicht beschäftigt
-	</string>
-	<string name="AvatarSetBusy">
-		Beschäftigt
-	</string>
 	<string name="shape">
 		Form
 	</string>
@@ -1989,8 +1986,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
-	<string name="BusyModeResponseDefault">
-		Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden.  Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden.
+	<string name="DoNotDisturbModeResponseDefault">
+		Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen.
 	</string>
 	<string name="MuteByName">
 		(Nach Namen)
@@ -2103,9 +2100,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Inhalte
-	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
 	</string>
@@ -3877,7 +3871,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Generelle Region
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
+		Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird.
@@ -3954,6 +3948,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="IM_unblock_only_groups_friends">
 		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
@@ -3963,6 +3963,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="you_joined_call">
 		Sie sind dem Gespräch beigetreten
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war.
+	</string>
 	<string name="name_started_call">
 		[NAME] hat einen Voice-Anruf begonnen
 	</string>
@@ -3979,7 +3982,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Wird verbunden...
 	</string>
 	<string name="conference-title">
-		Ad-hoc-Konferenz
+		Chat mit mehreren Personen
 	</string>
 	<string name="conference-title-incoming">
 		Konferenz mit [AGENT_NAME]
@@ -4859,6 +4862,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Unterhaltungen
+	</string>
 	<string name="Command_Compass_Label">
 		Kompass
 	</string>
@@ -4934,6 +4940,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Tooltip">
 		Mit Leuten in der Nähe chatten
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Mit allen unterhalten
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Kompass
 	</string>
@@ -5063,4 +5072,13 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="UserDictionary">
 		[Benutzer]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
new file mode 100644
index 0000000000..9202fab92d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar la gente" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
new file mode 100644
index 0000000000..f579e720fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSACIÓN:">
+	<floater.string name="Title">
+		CONVERSACIÓN: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
index 1cd752e6ec..f772441141 100644
--- a/indra/newview/skins/default/xui/es/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSACIONES"/>
+<multi_floater name="floater_im_box" title="CONVERSACIONES">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
+					<button name="add_btn" tool_tip="Iniciar una conversación nueva"/>
+					<button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Cerrar este panel"/>
+					<text name="stub_textbox">
+						Esta conversación está en una ventana aparte.   [secondlife:/// Traerla de vuelta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 3d9d17fc81..5f38fbd615 100644
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/>
+	<floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/>
+	<floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/>
+	<floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<button name="add_btn" tool_tip="Añadir alguien a esta conversación"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexión de voz"/>
+				<button name="close_btn" tool_tip="Finalizar esta conversación"/>
+				<button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index b5b756abb6..acbb25b713 100644
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anónimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		está llamando.
+		te está llamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha entrado en un chat de voz en multiconferencia.
@@ -25,9 +25,9 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz?
 	</floater.string>
 	<text name="question">
-		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
+		Si respondes, te desconectarás de la conversación de voz actual.
 	</text>
-	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
-	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
-	<button label="Comenzar un MI" name="Start IM"/>
+	<button label="Responder" label_selected="Responder" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Abrir MI en su lugar" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index e93ecc9e10..3602270e5a 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostrar:
 			</text>
-			<check_box label="Mundo virtual" name="show_world"/>
+			<check_box label="Prueba" name="show_world"/>
 			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 93bc9f293c..01b024bc3e 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Vista previa inmediata" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vista previa inhabilitada"/>
 	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..1115d67239
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ">
+	<slider label="Chat de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 1a265845af..02ebe80ff7 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ">
+<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
 	<string name="no_voice_effect">
 		(Sin transformación de voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
new file mode 100644
index 0000000000..0ebc511887
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUMEN DE VOZ">
+	<slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
index ff8ad0977a..a889992b8a 100644
--- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
new file mode 100644
index 0000000000..e4e9a0bf63
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
+	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar la voz" name="block_unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+	<menu_item_call label="Perfil del grupo" name="group_profile"/>
+	<menu_item_call label="Activar el grupo" name="activate_group"/>
+	<menu_item_call label="Abandonar el grupo" name="leave_group"/>
+	<context_menu label="Opciones del moderador" name="Moderator Options">
+		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
+		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..090e6fb0bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Llamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir el historial de chat..." name="Chat history"/>
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..b8b4616b2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por fecha" name="sort_by_date"/>
+	<menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/>
+	<menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
new file mode 100644
index 0000000000..5ba0fb898e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..6ea970b826
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compacta" name="compact_view"/>
+	<menu_item_check label="Vista ampliada" name="expanded_view"/>
+	<menu_item_check label="Mostrar tiempo" name="IMShowTime"/>
+	<menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index 7e4578b950..a99c889bb0 100644
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
 	<menu_item_call label="Ignorar..." name="Block"/>
+	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
+	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 558ff6afd3..56e64c729f 100644
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
 		<menu_item_call label="Ojos nuevos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Abrir todas las carpetas" name="expand"/>
+	<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
 	<menu_item_call label="Renombrar el vestuario" name="rename"/>
 	<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml
new file mode 100644
index 0000000000..fcfeeb922b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferencias de chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversaciones..." name="Conversation"/>
+	<menu_item_check label="Traducir el chat" name="Translate_chat"/>
+	<menu_item_check label="Configuración de traducción..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..986389a4fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="No ignorar" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..10f6a3fc14
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/>
+	<menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..bc557c7ec1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
new file mode 100644
index 0000000000..ad896c1b74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
+	<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 51bd2c7208..125e25cd1a 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Llamada de voz" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
new file mode 100644
index 0000000000..c3973625b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index dc1486d879..09bb119d5a 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
-	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Ver el historial de chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index 227c5ebe58..9df160f5ad 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
-	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigos" name="add_friends"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Visita" name="call"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..c2fb360dd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
new file mode 100644
index 0000000000..f0ffd14024
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por más reciente" name="sort_most"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index a089c8f68e..69a03671ab 100644
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/>
+	<menu_item_call label="Ver el perfil" name="show_agent"/>
+	<menu_item_call label="Enviar un MI..." name="send_im"/>
+	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index 8791a290af..e78fdec558 100644
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar la información del objeto" name="show_object"/>
+	<menu_item_call label="Perfil del objeto..." name="show_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index d80150ef6d..30842f53f2 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Estado" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
-		</menu>
+		<menu label="Estado" name="Status"/>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -31,14 +28,18 @@
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
+		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
-		<menu_item_check label="Configuración de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Transformación de voz..." name="ShowVoice"/>
+		<menu label="Transformación de voz" name="VoiceMorphing">
+			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Probar..." name="Preview"/>
+			<menu_item_call label="Suscribir..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Gente cerca" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Gente cerca" name="Active Speakers"/>
 		<menu_item_call label="Lista de ignorados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -114,7 +115,6 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Tomar" name="Menu Object Take"/>
 			<menu_item_call label="Coger una copia" name="Take Copy"/>
-			<menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -129,6 +129,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opciones" name="Options">
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
@@ -158,6 +159,13 @@
 	<menu label="Ayuda" name="Help">
 		<menu_item_call label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guía del usuario" name="User’s guide"/>
+		<menu_item_call label="Base de Conocimientos" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Foros comunitarios" name="Community Forums"/>
+		<menu_item_call label="Portal de soporte" name="Support portal"/>
+		<menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar una infracción" name="Report Abuse"/>
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
@@ -335,9 +343,14 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocidad de animación" name="Animation Speed">
+				<menu_item_call label="Acelerar todas las animaciones un 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Ralentizar todas las animaciones un 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Restablecer la velocidad de todas las animaciones" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animaciones a cámara lenta" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Animation Info" name="Animation Info"/>
-			<menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/>
 			<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="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 7dfb27717d..05455f54c3 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -511,6 +511,24 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos.  La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=es
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -1553,10 +1571,13 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 		En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Pasar al modo ocupado.
-Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera.
-		<usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones.
+
+- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias &gt; General).
+- Se rehusarán los ofrecimientos de teleporte.
+- Se rechazarán las llamadas de voz.
+		<usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta.
@@ -2043,6 +2064,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta?
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación.
+		<usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
@@ -2116,14 +2141,14 @@ Linden Lab
 			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
-	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
-		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
+	<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
+		Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
 
-¿Quieres salir del modo Ocupado antes de completar esta transacción?
+¿Deseas desactivar No molestar antes de finalizar esta transacción?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/>
-			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
-			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
+			<ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/>
+			<button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/>
+			<button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2258,11 +2283,8 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 	<notification name="GroupNotice">
 		Asunto: [SUBJECT], Mensaje: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está conectado
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está desconectado
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
@@ -2490,13 +2512,6 @@ Aquí no puedes volar.
 	<notification name="DynamicPathfindingDisabled">
 		Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto. Para que los objetos móviles se comporten correctamente, pulsa el botón “Recargar la región”. Si quieres más información, elige “Ayuda”.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Ayuda" ignoretext="Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2757,9 +2772,9 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
   
-Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
+No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
 		<form name="form">
 			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
@@ -3331,4 +3346,633 @@ Intento cancelado.
 		Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
 		<usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] te ha descongelado.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Error al congelar: no tienes permisos de administrador en esa parcela.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		La congelación ha terminado, puedes seguir con tus asuntos.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Lo sentimos, ese usuario no se puede congelar.
+	</notification>
+	<notification name="NowOwnObject">
+		Ahora eres el propietario del objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		El objeto no se puede colocar porque hay demasiadas solicitudes.
+	</notification>
+	<notification name="SitFailCantMove">
+		No te puedes sentar porque en este momento no puedes desplazarte.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		No te puedes sentar porque no tienes permiso para estar en ese terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Acércate. No te puedes sentar en el objeto porque
+no está en la misma región que tú.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		No se puede crear el nuevo objeto. La región está llena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		No puedes crear árboles y hierba en un terreno que no es tuyo.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Error al copiar: careces de permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Error al copiar: no se te puede transferir el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Error al copiar porque el objeto &apos;[OBJ_NAME]&apos; contribuye al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicación sin objetos raíz seleccionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		No se pueden duplicar objetos porque la región está llena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		No se puede crear el objeto porque 
+la parcela está llena.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Error al intentar colocar un objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		No se puede crear un objeto que ha causado problemas en esta región.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Ese objeto de inventario está en la lista negra.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Búsqueda de terrenos bloqueada.
+Has realizado demasiadas búsquedas de terreno con excesiva rapidez.
+Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Has muerto y te has teleportado a tu lugar de origen
+	</notification>
+	<notification name="EjectComingSoon">
+		Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		No puedes entrar en esta región porque 
+el servidor está lleno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Se ha deshabilitado Devolver el objeto a mi inventario.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque no tienes permiso para modificar el objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		No se puede guardar &apos;[OBJ_NAME]&apos; de nuevo en el inventario; esta operación está desactivada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		No se puede copiar tu selección porque no tienes permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoTransNoCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		El sistema de permisos no admite la eliminación del objeto &apos;[OBJ_NAME]&apos; del simulador.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		No se puede guardar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		No se puede guardar tu selección porque el objeto &apos;[OBJ_NAME]&apos; no se puede copiar.
+	</notification>
+	<notification name="NoModNoTaking">
+		No se puede aceptar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Error interno: tipo de destino desconocido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Error al borrar: el objeto no se encuentra
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Lo sentimos, ese usuario no se puede expulsar.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsado.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Error al expulsar: no tienes permiso de administrador en esa parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		No tienes permiso para modificar ese objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		No se puede habilitar la física para un objeto que contribuye al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		No se puede activar la física para los objetos con fotogramas clave.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		No se puede habilitar la física para el objeto: recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		¡No se puede añadir un objeto!
+	</notification>
+	<notification name="UnableEditItem">
+		¡No se puede editar esto!
+	</notification>
+	<notification name="NoPermToEdit">
+		No puedes editar esto.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		No está permitido copiar ese inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		No se puede guardar en el contenido del objeto: el objeto ya no existe.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Demasiados scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		¡No se puede añadir un script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta región no tiene habilitadas las formas de física.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		No se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		No se pueden establecer propiedades de física en ese tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		No se puede establecer que un prim raíz no tenga forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta región no tiene habilitados los materiales de física.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Solo se pueden ajustar los materiales de física de las prims raíces.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Aun no es posible configurar materiales de física para los personajes.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Una o varias de las propiedades de los materiales de física especificados no son válidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		No se puede cambiar el tipo de unión de un objeto de la malla.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		No se puede cambiar la forma de un objeto de la malla
+	</notification>
+	<notification name="FullRegionCantEnter">
+		No puedes entrar en esta región porque \nla región está llena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Error de vínculo: los propietarios son diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Error de vínculo: no se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Error de vínculo: no tienes permiso de edición.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Error de vínculo: demasiadas primitivas
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Error de vínculo: no se pueden vincular &apos;no copiable&apos; y &apos;no transferible&apos;
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Error de vínculo: no hay objetos que se puedan vincular.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Error de vínculo: demasiados personajes de pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Error de vínculo: recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Has sido teleportado al origen por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Has sido teleportado a tu origen por el objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Has sido teleportado por un anexo de [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; cuyo propietario es un usuario desconocido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		No se puede crear el objeto solicitado. La región está llena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		No puedes anexar varios objetos a un solo lugar.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Aquí no se pueden crear varios objetos.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		No se puede crear el objeto solicitado. Vuelve a intentarlo.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Error al colocar: la carga del objeto solicitado ha tardado demasiado.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		No se pueden crear plantas en este terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		No se puede restaurar el objeto. No se ha encontrado una posición del mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		No se puede colocar el objeto porque sus datos de malla no son válidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		No se puede colocar el objeto porque la región ya contiene demasiados scripts.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Tus privilegios de acceso no te permiten crear objetos allí.
+	</notification>
+	<notification name="CantCreateObject">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Los parámetros de objeto no son válidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Tus privilegios de acceso no te permiten duplicar objetos aquí.
+	</notification>
+	<notification name="CantChangeShape">
+		No tienes permiso para cambiar esta forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Tus privilegios de acceso no te permiten reclamar objetos aquí.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Error de transferencia: no tienes permiso para transferir objetos para tu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Tus privilegios de acceso no te autorizan a comprar objetos aquí.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		No se puede anexar el objeto porque un avatar está sentado en él.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		No te puedes poner árboles y hierba como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		No se pueden anexar objetos que son propiedad de grupos.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		No puedes anexar objetos de los que no eres propietario.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		No se pueden anexar objetos que contribuyen al navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		No se puede anexar el objeto porque no tienes permiso para moverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Error al soltar el anexo: no tienes permiso para soltarlo allí.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Error al soltar el anexo: recurso de terreno disponible insuficiente.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Error al soltar los anexos: los recursos disponibles son insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		No se puede soltar el objeto aquí. La parcela está llena.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Acota los parámetros de eliminación.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		No se puede subir el activo.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		No se ha podido encontrar el usuario para teleportarlo al origen
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		error en la solicitud de superpoderes
+	</notification>
+	<notification name="GenericRequestFailed">
+		error de solicitud genérico
+	</notification>
+	<notification name="CantUploadPostcard">
+		No se puede subir la postal. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		No se pueden obtener los datos de inventario del aviso de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		No se puede enviar el aviso de grupo: no está permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		No se puede enviar el aviso del grupo: el inventario no se puede construir.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		No se puede analizar el inventario del aviso.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Error al subir terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Se ha registrado el archivo de terreno.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Archivo de terreno registrado, iniciando la descarga...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno predeterminado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Para comprar esta parcela debes actualizar el visor.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Error al comprar: esta parcela no está en venta.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		No se puede comprar: el precio de venta o la superficie del terreno han cambiado.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		No eres el comprador autorizado de esta parcela.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		No puedes comprar esta parcela porque ya está en espera de una autorización de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		No se pueden construir objetos aquí porque se desbordaría la parcela.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		La selección no contiene suficientes parcelas alquiladas para unirlas.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -&gt; Notificar fallo...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		El terreno se ha dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Has comprado un pase.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		La región no permite anuncios.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Tu pase para este terreno está a punto de caducar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Esta superficie no es adecuada para sentarse, prueba en otro sitio.
+	</notification>
+	<notification name="CantSitNoRoom">
+		No hay sitio para sentarse aquí, prueba en otro lugar.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Error al reclamar el objeto: no tienes permiso
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Error al reclamar el objeto: no tienes suficientes L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		No se puede transferir un terreno propiedad de un grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Error al comprar el objeto, no tienes suficientes L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Error al comprar el inventario: no tienes suficientes L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		No tienes suficientes L$ para comprar un pase a este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		No se puede crear el objeto porque \nla parcela está llena.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		No se puede crear un hito para el evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		¡Tus superpoderes anulan la congelación!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Error en la solicitud de poderes especiales. Esta solicitud se ha registrado.
+	</notification>
+	<notification name="ExpireExplanation">
+		El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud.
+	</notification>
+	<notification name="DieExplanation">
+		El sistema no puede procesar tu solicitud.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Dinero insuficiente para crear la primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Dinero insuficiente para crear el objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Se ha restaurado la posición de origen, puesto que dicha posición no era válida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		No se puede quitar el objeto por un error del inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		No se puede crear el inventario solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		No se puede crear la carpeta de inventario solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		No se puede crear el inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		No se puede crear un hito.
+	</notification>
+	<notification name="CantCreateOutfit">
+		No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		El inventario no está en venta.
+	</notification>
+	<notification name="CantFindInvItem">
+		No se encuentra el objeto del inventario.
+	</notification>
+	<notification name="CantFindObject">
+		No se puede encontrar el objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		En esta región actualmente no están activadas las transferencias de dinero a los objetos.
+	</notification>
+	<notification name="CantPayNoAgent">
+		No se ha averiguado a quién se debe pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		No se pueden dar L$ a los objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Error al crear un inventario de objeto del mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo.
+		<usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup.
+		<usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		No se pueden mover los archivos. Ruta anterior restaurada.
+		<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
index 5220df5d21..c73e34b299 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index cddbad1195..a3de14ae67 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de ignorados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
-	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
-	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
-	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/>
+		<menu_button name="view_btn" tool_tip="Opciones de clasificación"/>
+		<menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/>
+		<button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..cc4a7e951d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(cargando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..2fc8cd3aff
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversación incluía voz"/>
+	<icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/>
+	<button name="delete_btn" tool_tip="Quitar esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
index 5c9f1c3688..4d682068d7 100644
--- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconocido"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index a9d38dca25..7a7dfca0b8 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar].
 	</string>
-	<string name="people_filter_label" value="Filtrar a la gente"/>
-	<string name="groups_filter_label" value="Filtrar a los grupos"/>
 	<string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/>
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
-	<filter_editor label="Filtrar" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="MIS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MIS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opciones"/>
-				<button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
-				<button name="activate_btn" tool_tip="Activar el grupo seleccionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar los grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
+				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
 			</panel>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADO" name="blocked_panel">
+			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index b0b6114e88..28bc98f988 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<text name="font_size">
-		Tamaño de la fuente:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Disminuir" name="radio" value="0"/>
-		<radio_item label="Medio" name="radio2" value="1"/>
-		<radio_item label="Aumentar" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
-	<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
-	<check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/>
-	<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar los MI en:
-	</text>
-	<text name="requires_restart_label">
-		(requiere reiniciar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
-		<radio_item label="Ventanas distintas" name="radio" value="0"/>
-		<radio_item label="Pestañas" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Permitir ventanas de chat emergentes:
-	</text>
-	<check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/>
-	<check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/>
-	<spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/>
-	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
+		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamaño de la fuente:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeña" name="Small" value="0"/>
+			<item label="Mediana" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notificaciones
+		</text>
+		<text name="friend_ims">
+			MI de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			MI de no amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="conference_ims">
+			MI de conferencia:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Para suspender provisionalmente todas las notificaciones, usa Comunicarme &gt; No molestar.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Reproducir sonido:
+		</text>
+		<check_box label="Nueva conversación" name="new_conversation"/>
+		<check_box label="Llamada de voz entrante" name="incoming_voice_call"/>
+		<check_box label="Oferta de teleporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventario" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Limpiar el registro..." name="clear_log"/>
+		<button label="Eliminar transcripciones..." name="delete_transcripts"/>
+		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
+	</panel>
 	<button label="Traducción…" name="ok_btn"/>
 	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
 	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 4fc163f5b6..98b0081da9 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta cuando estoy en modo ocupado:
+		Respuesta de No molestar:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index 9da2958953..cb061796e7 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar el objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 52bcab54e5..937433e210 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
@@ -610,8 +610,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AvatarAway">
 		Ausente
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		No molestar
 	</string>
 	<string name="AvatarMuted">
 		Ignorado
@@ -844,6 +844,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ST_NO_JOINT">
 		No se puede encontrar ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat)
+	</string>
 	<string name="whisper">
 		susurra:
 	</string>
@@ -907,6 +913,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
+	<string name="AgentNameSubst">
+		(Tú)
+	</string>
 	<string name="TeleportYourAgent">
 		Teleportarte
 	</string>
@@ -991,18 +1000,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="dictionary_files">
 		Diccionarios
 	</string>
-	<string name="AvatarSetNotAway">
-		Salir del estado ausente
-	</string>
-	<string name="AvatarSetAway">
-		Pasar al estado ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Salir del estado ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Pasar al estado ocupado
-	</string>
 	<string name="shape">
 		Forma
 	</string>
@@ -1959,8 +1956,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="PanelContentsNewScript">
 		Script nuevo
 	</string>
-	<string name="BusyModeResponseDefault">
-		El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente tiene activado &apos;No molestar&apos; y verá tu mensaje más tarde.
 	</string>
 	<string name="MuteByName">
 		(Por el nombre)
@@ -2073,9 +2070,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenidos
-	</string>
 	<string name="AcquiredItems">
 		Artículos adquiridos
 	</string>
@@ -3793,7 +3787,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Región General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Los avatares están visibles y está permitido el chat fuera de esta parcela
+		Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue.
@@ -3867,6 +3861,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Saved_message">
 		(Guardado [LONG_TIMESTAMP])
 	</string>
+	<string name="OnlineStatus">
+		Conectado/a
+	</string>
+	<string name="OfflineStatus">
+		Desconectado/a
+	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
@@ -3876,6 +3876,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Has entrado en la llamada de voz
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Rechazaste la llamada de voz automáticamente porque estaba activado &apos;No molestar&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] inició una llamada de voz
 	</string>
@@ -3888,6 +3891,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Se colgó la llamada de voz
 	</string>
+	<string name="conference-title">
+		Chat multi-persona
+	</string>
 	<string name="conference-title-incoming">
 		Conferencia con [AGENT_NAME]
 	</string>
@@ -4766,6 +4772,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversaciones
+	</string>
 	<string name="Command_Compass_Label">
 		Brújula
 	</string>
@@ -4841,6 +4850,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Tooltip">
 		Habla por chat de texto con las personas próximas
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar con todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Brújula
 	</string>
@@ -4970,4 +4982,13 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="UserDictionary">
 		[Usuario]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
new file mode 100644
index 0000000000..e9017c79b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..9a486a84c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSATION:">
+	<floater.string name="Title">
+		CONVERSATION: [NAME]
+	</floater.string>
+	<text name="page_label" value="Page"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
index 5ea073365e..f0b17e8437 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
+<multi_floater name="floater_im_box" title="CONVERSATIONS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
+					<button name="add_btn" tool_tip="Commencer une nouvelle conversation"/>
+					<button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/>
+					<text name="stub_textbox">
+						Cette conversation s&apos;affiche dans une fenêtre distincte.   [secondlife:/// la rattacher.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 516eb41362..8ab98b8e4e 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="À" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] a été invité à la conversation."/>
+	<floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/>
+	<floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/>
+	<floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/>
+	<floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/>
+	<floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/>
+				<button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/>
+				<button name="close_btn" tool_tip="Mettre fin à cette conversation"/>
+				<button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="À" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
index 7594eec5f2..9e6946ba9e 100644
--- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonyme
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		appelle.
+		vous appelle.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		a rejoint un chat vocal avec conférence.
@@ -25,9 +25,9 @@
 		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</floater.string>
 	<text name="question">
-		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
+		Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle.
 	</text>
-	<button label="Accepter" label_selected="Accepter" name="Accept"/>
-	<button label="Refuser" label_selected="Refuser" name="Reject"/>
-	<button label="Lancer IM" name="Start IM"/>
+	<button label="Répondre" label_selected="Répondre" name="Accept"/>
+	<button label="Ignorer" label_selected="Ignorer" name="Reject"/>
+	<button label="Ouvrir IM à la place" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 02d969dc08..0bcf55aba5 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Afficher :
 			</text>
-			<check_box label="Monde" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
 			<check_box label="Maillage de navigation" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index f86c1a4217..eace67026c 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..f4f452eea7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL">
+	<slider label="Chat vocal" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index 671fb5c14d..f9a76d127e 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX">
+<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
 	<string name="no_voice_effect">
 		(Aucun effet de voix)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
new file mode 100644
index 0000000000..bf91a5bb79
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE LA VOIX">
+	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
index 8276d57025..fea0486d8a 100644
--- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/>
-	<menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
new file mode 100644
index 0000000000..857ead603b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
+	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
+	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Supprimer ces amis" name="remove_friends"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="block_unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+	<menu_item_call label="Profil du groupe" name="group_profile"/>
+	<menu_item_call label="Activer le groupe" name="activate_group"/>
+	<menu_item_call label="Quitter le groupe" name="leave_group"/>
+	<context_menu label="Options du modérateur" name="Moderator Options">
+		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
+		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/>
+		<menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..4e7e84199d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Appel..." name="Call"/>
+	<menu_item_call label="Ouvrir l&apos;historique du chat..." name="Chat history"/>
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Téléporter" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="Invite"/>
+	<menu_item_call label="Carte" name="Map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..c515a8e8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par date" name="sort_by_date"/>
+	<menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/>
+	<menu_item_call label="Afficher l&apos;historique du Chat près de moi" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
new file mode 100644
index 0000000000..1ec5910c8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..03a091d1cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vue compacte" name="compact_view"/>
+	<menu_item_check label="Vue développée" name="expanded_view"/>
+	<menu_item_check label="Afficher l’heure" name="IMShowTime"/>
+	<menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 69f8e88a0d..7c94930160 100644
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
 	<menu_item_call label="Ignorer..." name="Block"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Me téléporter à l’emplacement de l&apos;objet" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index b5181f4f82..21b19eded6 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Développer tous les dossiers" name="expand"/>
+	<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
new file mode 100644
index 0000000000..1811082c84
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/>
+	<menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/>
+	<menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/>
+	<menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Préférences pour le chat..." name="chat_preferences"/>
+	<menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/>
+	<menu_item_check label="Journal des conversations..." name="Conversation"/>
+	<menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/>
+	<menu_item_check label="Paramètres de traduction" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..47589572c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Ne plus ignorer" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..79880dd16d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
+	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..13f1575090
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par type" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..cc81172462
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par statut" name="sort_status"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
+	<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
index eb51b4cf7e..8e32f065fa 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Afficher les infos" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Appel" name="Call"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Quitter" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..79ede5e22d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 26bd3978a9..6f7d02ef74 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Devenir amis" name="Add Friend"/>
-	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Carte" name="Map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Afficher l&apos;historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
index 8400ec0a14..37abf831c2 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Devenir amis" name="Add Friends"/>
-	<menu_item_call label="Supprimer des amis" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friends"/>
+	<menu_item_call label="Supprimer des amis" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Appeler" name="call"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..086002dce5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par distance" name="sort_distance"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher la carte" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a7d698ab7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index 5ed627fbc3..d701b3a414 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
+	<menu_item_call label="Voir le profil" name="show_agent"/>
+	<menu_item_call label="Envoyer IM..." name="send_im"/>
+	<menu_item_call label="Devenir amis..." name="add_friend"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index f581c3ef9d..0a934d3e69 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
+	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 85020afe25..457b756c7d 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Statut" name="Status">
-			<menu_item_call label="Absent" name="Set Away"/>
-			<menu_item_call label="Occupé" name="Set Busy"/>
-		</menu>
+		<menu label="Statut" name="Status"/>
 		<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="Page d&apos;accueil du compte..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversations..." name="Conversations"/>
+		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
-		<menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/>
-		<menu_item_check label="Effet de voix..." name="ShowVoice"/>
+		<menu label="Effet de voix" name="VoiceMorphing">
+			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
+			<menu_item_check label="Aperçu..." name="Preview"/>
+			<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestes..." name="Gestures"/>
-		<menu_item_call label="Amis" name="My Friends"/>
-		<menu_item_call label="Groupes" name="My Groups"/>
-		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_check label="Amis" name="My Friends"/>
+		<menu_item_check label="Groupes" name="My Groups"/>
+		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
 		<menu_item_call label="Liste des ignorés" name="Block List"/>
 	</menu>
 	<menu label="Monde" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Acheter" name="Menu Object Buy"/>
 			<menu_item_call label="Prendre" name="Menu Object Take"/>
 			<menu_item_call label="Prendre une copie" name="Take Copy"/>
-			<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Renvoi de l&apos;objet" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Options" name="Options">
 			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Aide rapide..." name="How To"/>
 		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guide de l&apos;utilisateur" name="User’s guide"/>
+		<menu_item_call label="Base de connaissances" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forums de la communauté" name="Community Forums"/>
+		<menu_item_call label="Portail d&apos;assistance" name="Support portal"/>
+		<menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
@@ -385,9 +393,14 @@
 				<menu_item_call label="Test femme" name="Test Female"/>
 				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Vitesse d&apos;animation" name="Animation Speed">
+				<menu_item_call label="Toutes les animations 10 % plus rapides" name="All Animations 10 Faster"/>
+				<menu_item_call label="Toutes les animations 10 % plus lentes" name="All Animations 10 Slower"/>
+				<menu_item_call label="Réinitialiser la vitesse de toutes les animations" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
 			<menu_item_check label="Infos sur l&apos;animation" name="Animation Info"/>
-			<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
 			<menu_item_check label="Afficher la direction du regard" name="Show Look At"/>
 			<menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/>
 			<menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 30154d1873..e73cc6e6e0 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -515,6 +515,24 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=fr
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -1543,10 +1561,13 @@ Quitter le groupe ?
 		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Le mode Occupé est sélectionné.
-Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
-		<usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Ne pas déranger est activé.  Vous ne recevrez pas les notifications de communications entrantes.
+
+- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences &gt; Général).
+- Toutes les offres de téléportation seront refusées.
+- Les appels vocaux seront refusés.
+		<usetemplate ignoretext="J&apos;ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
@@ -2033,6 +2054,10 @@ Déplacer les objets de l&apos;inventaire ?
 		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée.  Tous les participants recevront les notifications de nouvelle conversation.
+		<usetemplate ignoretext="Confirmer l&apos;ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Êtes-vous certain de vouloir quitter ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2107,14 +2132,14 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
 	</notification>
-	<notification label="Réponse si occupé(e)" name="BusyModePay">
-		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
+	<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
+		Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
 
-Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
+Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/>
-			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
+			<ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/>
+			<button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 	<notification name="GroupNotice">
 		Sujet : [SUBJECT], Message : [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est en ligne
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est hors ligne
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
@@ -2482,13 +2504,6 @@ Vous ne pouvez pas voler ici.
 	<notification name="DynamicPathfindingDisabled">
 		La recherche de chemin dynamique n&apos;est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles. Pour que les objets mobiles se comportent correctement, cliquez sur Refiger la région. Pour plus d&apos;informations, choisissez Aide.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Aide" ignoretext="La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Une erreur est survenue. Un problème réseau ou serveur s&apos;est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2766,7 @@ Acceptez-vous ?
 	<notification name="ScriptQuestionCaution">
 		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
   
-Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
+N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
 			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
@@ -3332,4 +3347,633 @@ Désactivation des mises à jour futures de ce fichier...
 		Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
 		<usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar figé.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] vous a libéré.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar libéré.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Vous n&apos;avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Vous n&apos;êtes plus figé, vous pouvez reprendre votre vie.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Impossible de figer cet utilisateur.
+	</notification>
+	<notification name="NowOwnObject">
+		Vous êtes désormais le propriétaire de l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="CantRezOnLand">
+		Impossible de rezzer l&apos;objet à [OBJECT_POS] car le propriétaire de ce terrain de l&apos;autorise pas.  Utilisez l&apos;outil Terrain pour voir à qui appartiennent les terrains.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Impossible de rezzer l&apos;objet car il y a trop de demandes.
+	</notification>
+	<notification name="SitFailCantMove">
+		Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n&apos;est pas autorisée.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Essayez de vous rapprocher.  Impossible de vous asseoir sur l&apos;objet car
+il ne se trouve pas dans la même région que vous.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Création d&apos;un nouvel objet impossible. La région est pleine.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Vous ne pouvez pas créer d&apos;arbres ni d&apos;herbe sur un terrain qui ne vous appartient pas.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Échec de la copie car vous ne disposez pas des droits requis pour copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Échec de la copie car l&apos;objet [OBJ_NAME] ne peut pas vous être transféré.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Échec de la copie car l&apos;objet [OBJ_NAME] contribue au maillage de navigation.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Dupliquer sans objet racine sélectionné
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossible de dupliquer les objets car la région est pleine.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Création de l&apos;objet impossible car 
+la parcelle est pleine.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Échec d&apos;une tentative pour rezzer un objet.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossible de créer l&apos;article qui a provoqué des problèmes pour cette région.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Cet article d&apos;inventaire a été placé sur liste noire.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Recherche de terrain bloquée.
+Vous avez effectué trop de recherches de terrain trop rapidement.
+Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Vous êtes mort et avez été téléporté à votre domicile.
+	</notification>
+	<notification name="EjectComingSoon">
+		Votre présence ici n&apos;est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Vous ne pouvez pas pénétrer dans cette région car 
+le serveur est plein.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Le réenregistrement dans l&apos;inventaire a été désactivé.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car l&apos;objet à partir duquel il a été rezzé n&apos;existe plus.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l&apos;objet [DEST_NAME].
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossible de réenregistrer [OBJ_NAME] dans l&apos;inventaire -- cette opération a été désactivée.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car vous n&apos;avez pas le droit de copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La suppression de l&apos;objet [OBJ_NAME] du simulateur n&apos;est pas autorisée par le système de droits.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car l&apos;objet [OBJ_NAME] ne peut pas être copié.
+	</notification>
+	<notification name="NoModNoTaking">
+		Vous ne pouvez pas prendre votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="RezDestInternalError">
+		Erreur interne : type de destination inconnue.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Échec de la suppression car l&apos;objet est introuvable
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Exclusion de cet utilisateur impossible.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="HomePositionSet">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsé.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Vous n&apos;avez pas pu réaliser l&apos;exclusion car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car il n&apos;y a pas suffisamment de ressources pour cet objet sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car l&apos;autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Vous n&apos;êtes pas autorisé à modifier cet objet.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Impossible d&apos;activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec images-clés.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossible d&apos;activer les propriétés physiques pour l&apos;objet -- ressources de terrain insuffisantes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Cet objet ne peut pas contenir de morceau concave car c&apos;est un fantôme qui contribue au maillage de navigation.
+	</notification>
+	<notification name="UnableAddItem">
+		Ajout de l&apos;article impossible.
+	</notification>
+	<notification name="UnableEditItem">
+		Modification impossible
+	</notification>
+	<notification name="NoPermToEdit">
+		Modification interdite.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Pas autorisé à copier cet inventaire.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossible d&apos;enregistrer dans le contenu des objets : L&apos;article n&apos;existe plus.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossible d&apos;enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l&apos;inventaire.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossible d&apos;enregistrer dans le contenu des objets : cela modifierait les droits d&apos;attache.
+	</notification>
+	<notification name="TooManyScripts">
+		Trop de scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Ajout du script impossible.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Le serveur d&apos;actifs n&apos;a pas répondu assez vite.  Objet renvoyé dans le sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Les formes physiques ne sont pas activées pour cette région.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossible de définir les propriétés physiques pour ce type d&apos;objet.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Vous devenez définir une forme pour la prim racine.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Les matériaux physiques ne sont pas activés pour cette région.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Les matériaux physiques ne peuvent être ajustés que pour les prims racines.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		La configuration de matériaux physiques sur les personnages n&apos;est pas prise en charge actuellement.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Une ou plusieurs propriétés des ressources physiques spécifiées n&apos;étaient pas valides.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Vous ne pouvez pas changer le type de raccord d&apos;un objet avec maillage.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Vous ne pouvez pas changer la forme d&apos;un objet avec maillage.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Échec du lien -- les propriétaires sont différents
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Échec du lien car vous ne disposez pas des droits de modification.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Échec du lien -- trop de primitives
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Échec du lien -- impossible de lier pas de copie et pas de transfert
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Échec du lien - il n&apos;y a rien qui puisse être lié.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Échec du lien -- trop de personnages de recherche de chemin
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Échec du lien -- ressources de terrain insuffisantes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Vous avez été téléporté par un élément sur [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Création de l&apos;objet demandé impossible. La région est pleine.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Vous ne pouvez pas attacher plusieurs objets au même endroit.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Vous ne pouvez pas créer plusieurs objets ici.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Création de l&apos;objet demandé impossible. Objet absent de la base de données.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Création de l&apos;objet demandé impossible. Délai d&apos;attente dépassé. Veuillez réessayer.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Création de l&apos;objet demandé impossible. Veuillez réessayer.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Échec de l&apos;action « rezzer », le chargement de l&apos;objet demandé a pris trop longtemps.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Vous ne pouvez pas créer de plantes sur ce terrain.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossible de restaurer l&apos;objet. Position dans le monde introuvable.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossible de rezzer l&apos;objet car ses données de maillage ne sont pas valides.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossible de rezzer l&apos;objet car il y a déjà trop de scripts dans cette région.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à créer des objets à cet endroit.
+	</notification>
+	<notification name="CantCreateObject">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Paramètres d&apos;objet non valides
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à dupliquer des objets ici.
+	</notification>
+	<notification name="CantChangeShape">
+		Vous n’êtes pas autorisé à modifier cette forme.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Vos privilèges d&apos;accès ne vous autorisent pas à revendiquer des objets ici.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Vos privilèges d&apos;accès ne vous autorisent pas à acheter des objets ici.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossible d&apos;attacher l&apos;objet car un avatar est assis dessus.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Les arbres et les plantes ne peuvent pas être portés sous forme d&apos;éléments attachés.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossible d&apos;attacher les objets appartenant au groupe.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossible d&apos;attacher les objets contribuant au maillage de navigation.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Impossible d&apos;attacher l&apos;objet car vous n&apos;avez pas le droit de le déplacer.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</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>
+	<notification name="CantDropMeshAttachment">
+		Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l&apos;inventaire puis rezzez-les dans le monde.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		L&apos;élément n&apos;a pas pu être déposé : vous n&apos;avez pas le droit de déposer des éléments à cet endroit.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		L&apos;élément n&apos;a pas pu être déposé : ressources de terrain disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Les éléments n&apos;ont pas pu être déposés : ressources disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Impossible de déposer l&apos;objet ici.  La parcelle est pleine.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Veuillez affiner vos paramètres de suppression.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Chargement de l&apos;actif impossible.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Impossible de trouver l&apos;utilisateur à téléporter chez lui
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		échec de la demande de type divine
+	</notification>
+	<notification name="GenericRequestFailed">
+		échec de la demande générique
+	</notification>
+	<notification name="CantUploadPostcard">
+		Chargement de la carte postale impossible.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Impossible récupérer les détails de l&apos;inventaire pour la notice au groupe.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossible d&apos;envoyer une notice au groupe -- ce n&apos;est pas autorisé.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossible d&apos;envoyer une notice au groupe - échec de la construction de l&apos;inventaire.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossible d&apos;analyser l&apos;inventaire dans la notice.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Échec du chargement du terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Fichier de terrain écrit
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Fichier de terrain écrit, lancement du téléchargement...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain figé.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Vous devez mettre votre client à jour pour acheter cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Achat impossible, cette parcelle n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Achat impossible, le prix de vente ou la zone de terrain a changé.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Vous n&apos;êtes pas un acheteur autorisé pour cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d&apos;une autorisation d&apos;achat.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Vous ne pouvez pas construire d&apos;objets ici car cela saturerait la parcelle.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -&gt; Signaler un bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Le terrain a été divisé.
+	</notification>
+	<notification name="PassPurchased">
+		Vous avez acheté un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Cette région n&apos;autorise pas les petites annonces.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Votre pass pour ce terrain arrive à expiration.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Il n&apos;y a pas de surface appropriée sur laquelle s&apos;asseoir, essayez un autre endroit.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Pas de place pour s&apos;asseoir ici, essayez un autre endroit.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas des droits requis.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Impossible de céder un terrain appartenant au groupe.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Échec de l&apos;achat de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Échec de l&apos;achat d&apos;inventaire car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Impossible d&apos;acheter le pass actuellement.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Création de l&apos;objet impossible car \nla parcelle est pleine.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossible de créer le repère pour l&apos;événement.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Grâce à vos pouvoirs de type divin, vous n&apos;êtes plus figé.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée.
+	</notification>
+	<notification name="ExpireExplanation">
+		Le système ne peut pas traiter votre demande actuellement. Délai d&apos;attente dépassé.
+	</notification>
+	<notification name="DieExplanation">
+		Le système ne peut pas traiter votre demande.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fonds insuffisants pour créer la primitive.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fonds insuffisants pour créer l&apos;objet.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Réinitialiser l&apos;emplacement du domicile car il n&apos;était pas légal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="SetHomePosition">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossible de dérezzer l&apos;objet à cause d&apos;un défaut d&apos;inventaire.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Création de l&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Création du dossier d&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateInventory">
+		Création de cet inventaire impossible.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Création du repère impossible.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Création de la tenue impossible. Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventaire n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantFindInvItem">
+		Objet de l&apos;inventaire introuvable.
+	</notification>
+	<notification name="CantFindObject">
+		Objet introuvable.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Les transferts d&apos;argent aux objets sont actuellement désactivés dans cette région.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Impossible de savoir qui payer.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Vous ne pouvez pas donner de L$ à des objets publics.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Échec de la création d&apos;inventaire sur l&apos;objet Second Life.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Une erreur interne nous a empêchés de mettre votre client à jour correctement.  Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Impossible de créer de grandes prims qui coupent d&apos;autres joueurs.  Réessayez une fois que les autres joueurs se seront déplacés.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier.
+		<usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés.
+		<usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossible de déplacer les fichiers. Chemin précédent rétabli.
+		<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
index 54b8f53e59..c8fa9f340f 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/>
 	<icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/>
 	<icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
index 96add2a74b..0e2b5a9c93 100644
--- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Liste des ignorés
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
-	<button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
-	<button label="Ignorer un objet par son nom" label_selected="Ignorer un objet par son nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
-	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrer" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l&apos;objet sélectionné"/>
+		<menu_button name="view_btn" tool_tip="Options de tri"/>
+		<menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/>
+		<button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ebf18f6483
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(chargement)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..9c277842b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/>
+	<icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/>
+	<button name="delete_btn" tool_tip="Supprimer cette entrée"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
index 5fb69d1989..b1b32af7c6 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Inconnu"/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f035853efc..227ce26df7 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -14,81 +14,53 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_filtered_friends_msg">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher].
 	</string>
-	<string name="people_filter_label" value="Filtrer les personnes"/>
-	<string name="groups_filter_label" value="Filtrer les groupes"/>
 	<string name="no_filtered_groups_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/>
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
-	<filter_editor label="Filtre" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="nearby_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
-		<panel label="MES AMIS" name="friends_panel">
+		<panel label="AMIS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="friends_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Afficher d&apos;autres options"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis."/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MES GROUPES" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
-				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
-				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
+		<panel label="GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrer les groupes" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/>
+				<menu_button name="groups_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
 			</panel>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="recent_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUÉ" name="blocked_panel">
+			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 550beb653e..972190dc15 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<text name="font_size">
-		Taille de la police :
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Petite" name="radio" value="0"/>
-		<radio_item label="Moyenne" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
-	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
-	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
-	<check_box label="Bulles de chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Afficher les IM dans :
-	</text>
-	<text name="requires_restart_label">
-		(redémarrage requis)
-	</text>
-	<radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)">
-		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
-		<radio_item label="Onglets" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Activer les popups de chat entrant :
-	</text>
-	<check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message de chat de groupe."/>
-	<check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message instantané."/>
-	<spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/>
-	<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Taille de la police :
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Petite" name="Small" value="0"/>
+			<item label="Moyenne" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notifications
+		</text>
+		<text name="friend_ims">
+			IM amis :
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM non amis :
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM conférence :
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat de groupe :
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat près de moi :
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Écouter le son :
+		</text>
+		<check_box label="Nouvelle conversation" name="new_conversation"/>
+		<check_box label="Appel entrant" name="incoming_voice_call"/>
+		<check_box label="Offre de téléportation" name="teleport_offer"/>
+		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Effacer le journal..." name="clear_log"/>
+		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
+		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
+	</panel>
 	<button label="Traduction..." name="ok_btn"/>
 	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
 	<button label="Orthographe..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 66b84af3aa..533c392d6b 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="Jamais" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Réponse si occupé(e) :
+		Réponse Ne pas déranger
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index 60027d41cb..896dd932e3 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 			<combo_box.item label="Ouvrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 6a2a3f559a..69ed20f376 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=fr-FR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
@@ -622,8 +622,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AvatarAway">
 		Absent
 	</string>
-	<string name="AvatarBusy">
-		Occupé
+	<string name="AvatarDoNotDisturb">
+		Ne pas déranger
 	</string>
 	<string name="AvatarMuted">
 		Bloqué(e)
@@ -859,6 +859,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ST_NO_JOINT">
 		Impossible de trouver ROOT ou JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat près de moi
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat près de moi)
+	</string>
 	<string name="whisper">
 		chuchote :
 	</string>
@@ -922,12 +928,15 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
-	<string name="TeleportYourAgent">
-		Vous téléporter
-	</string>
 	<string name="NotConnected">
 		Pas connecté(e)
 	</string>
+	<string name="AgentNameSubst">
+		(Vous)
+	</string>
+	<string name="TeleportYourAgent">
+		Vous téléporter
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1009,18 +1018,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="dictionary_files">
 		Dictionnaires
 	</string>
-	<string name="AvatarSetNotAway">
-		Présent
-	</string>
-	<string name="AvatarSetAway">
-		Absent
-	</string>
-	<string name="AvatarSetNotBusy">
-		Pas occupé
-	</string>
-	<string name="AvatarSetBusy">
-		Occupé
-	</string>
 	<string name="shape">
 		Silhouette
 	</string>
@@ -1989,8 +1986,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
+	<string name="DoNotDisturbModeResponseDefault">
+		Ce résident a activé Ne pas déranger et verra votre message plus tard.
 	</string>
 	<string name="MuteByName">
 		(par nom)
@@ -2103,9 +2100,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenus
-	</string>
 	<string name="AcquiredItems">
 		Objets acquis
 	</string>
@@ -3877,7 +3871,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Région de type Général
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatars visibles et chat autorisé en dehors de cette parcelle
+		Les avatars à l&apos;extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l&apos;intérieur.
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu&apos;elle n&apos;est pas refigée.
@@ -3954,6 +3948,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM, sous Préférences/Confidentialité.
 	</string>
+	<string name="OnlineStatus">
+		En ligne
+	</string>
+	<string name="OfflineStatus">
+		Hors ligne
+	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
@@ -3963,6 +3963,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Vous avez rejoint l&apos;appel
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Vous avez automatiquement refusé l&apos;appel vocal quand le mode Ne pas déranger était activé.
+	</string>
 	<string name="name_started_call">
 		[NAME] appelle.
 	</string>
@@ -3979,7 +3982,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Connexion en cours...
 	</string>
 	<string name="conference-title">
-		Conférence ad-hoc
+		Chat à plusieurs
 	</string>
 	<string name="conference-title-incoming">
 		Conférence avec [AGENT_NAME]
@@ -4859,6 +4862,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversations
+	</string>
 	<string name="Command_Compass_Label">
 		Boussole
 	</string>
@@ -4934,6 +4940,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Tooltip">
 		Parler aux personnes près de vous par chat écrit
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Parler à quelqu&apos;un
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Boussole
 	</string>
@@ -5063,4 +5072,13 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
new file mode 100644
index 0000000000..8354824ed1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtro persone" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
new file mode 100644
index 0000000000..d0e9c8ee0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSAZIONE:">
+	<floater.string name="Title">
+		CONVERSAZIONE: [NAME]
+	</floater.string>
+	<text name="page_label" value="Pagina"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
index fb8e77b32f..10cf1b7f7e 100644
--- a/indra/newview/skins/default/xui/it/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAZIONI"/>
+<multi_floater name="floater_im_box" title="CONVERSAZIONI">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/>
+					<button name="add_btn" tool_tip="Avvia una nuova conversazione"/>
+					<button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/>
+					<text name="stub_textbox">
+						Questa conversazione in una finestra separata.   [secondlife:/// Ripristina conversazione.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index 3d9d17fc81..d38ec7a5fe 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/>
+	<floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/>
+	<floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/>
+	<floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/>
+	<floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l&apos;elenco dei partecipanti"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/>
+				<button name="voice_call_btn" tool_tip="Apri collegamento voce"/>
+				<button name="close_btn" tool_tip="Termina questa conversazione"/>
+				<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduci chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index a95ed44662..566920209d 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		sta chiamando.
+		ti sta chiamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha aderito ad una chiamata in chat vocale in conferenza.
@@ -25,9 +25,9 @@
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
-		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
+		Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente.
 	</text>
-	<button label="Accetta" label_selected="Accetta" name="Accept"/>
-	<button label="Rifiuta" label_selected="Rifiuta" name="Reject"/>
-	<button label="Inizia IM" name="Start IM"/>
+	<button label="Risposta" label_selected="Risposta" name="Accept"/>
+	<button label="Ignora" label_selected="Ignora" name="Reject"/>
+	<button label="Apri invece IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 77be220a2a..7777444161 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostra:
 			</text>
-			<check_box label="Mondo" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index c97a91bb3f..27a17868a7 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Default" label_selected="Default" name="Default"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
 	<button label="Niente" label_selected="Niente" name="None"/>
-	<check_box initial_value="true" label="Anteprima dal vivo" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Anteprima disattivata"/>
 	<filter_editor label="Filtro texture" name="inventory search editor"/>
 	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..b168d067c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE">
+	<slider label="Chat vocale" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index c83b11f698..f102622f5d 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE">
+<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
 	<string name="no_voice_effect">
 		(Nessuna manipolazione voce)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
new file mode 100644
index 0000000000..eaeda7597f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME VOCE">
+	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
index 10524ba92d..984e4a1611 100644
--- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
new file mode 100644
index 0000000000..46ced93f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
+	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
+	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca voce" name="block_unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+	<menu_item_call label="Profilo del gruppo" name="group_profile"/>
+	<menu_item_call label="Attiva gruppo" name="activate_group"/>
+	<menu_item_call label="Lascia il gruppo" name="leave_group"/>
+	<context_menu label="Opzioni moderatore" name="Moderator Options">
+		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
+		<menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
+		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..5686a902eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Chiamata a voce..." name="Call"/>
+	<menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/>
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="Invite"/>
+	<menu_item_call label="Mappa" name="Map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..73b05831ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
+	<menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/>
+	<menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
new file mode 100644
index 0000000000..1621d57e12
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Aggiungi come amico" name="Add Friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca voce" name="Block/Unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..350fbc5c6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compatta" name="compact_view"/>
+	<menu_item_check label="Vista espansa" name="expanded_view"/>
+	<menu_item_check label="Mostra orario" name="IMShowTime"/>
+	<menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 0f347b1a90..9623775af4 100644
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
 	<menu_item_call label="Blocca..." name="Block"/>
+	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
+	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 09fc867d7c..3ac0c5ce69 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nuovi capelli" name="New Hair"/>
 		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Apri tutte le cartelle" name="expand"/>
+	<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml
new file mode 100644
index 0000000000..c87cda57bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferenze chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferenze privacy..." name="privacy_preferences"/>
+	<menu_item_check label="Registro conversazioni..." name="Conversation"/>
+	<menu_item_check label="Traduci chat vicina" name="Translate_chat"/>
+	<menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..e9955923b2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Sblocca" name="unblock"/>
+	<menu_item_call label="Profilo..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..cbcf084b86
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..fc80c73ae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base al tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
new file mode 100644
index 0000000000..972e359cfe
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
+	<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
index 30a97a1c72..8ca7537ee0 100644
--- a/indra/newview/skins/default/xui/it/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Mostra informazioni" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Chiamata a voce" name="Call"/>
 	<menu_item_call label="Attiva" name="Activate"/>
 	<menu_item_call label="Chiudi" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
new file mode 100644
index 0000000000..56b9abbd3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index a974bd181d..1c09b1cfe2 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Aggiungi amico" name="Add Friend"/>
-	<menu_item_call label="Rimuovi amico" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Mappa" name="Map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
index e0b9ceb63d..b9ce70167f 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Aggiungi amici" name="Add Friends"/>
-	<menu_item_call label="Rimuovi amici" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi amici" name="add_friends"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Chiama" name="call"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..223d88fee1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra mappa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
new file mode 100644
index 0000000000..fc6213bd08
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index 37755d5749..abfbab35a3 100644
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra profilo residente" name="show_agent"/>
+	<menu_item_call label="Vedi profilo" name="show_agent"/>
+	<menu_item_call label="Manda IM..." name="send_im"/>
+	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 763e65f17c..8456d14b63 100644
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra informazioni oggetto" name="show_object"/>
+	<menu_item_call label="Profilo oggetto..." name="show_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 547c5a9b73..c93b92029f 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Stato" name="Status">
-			<menu_item_call label="Assente" name="Set Away"/>
-			<menu_item_call label="Non disponibile" name="Set Busy"/>
-		</menu>
+		<menu label="Stato" name="Status"/>
 		<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="Dashboard dell&apos;account..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversazioni..." name="Conversations"/>
+		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
-		<menu_item_check label="Impostazioni voce..." name="Nearby Voice"/>
-		<menu_item_check label="Manipolazione voce..." name="ShowVoice"/>
+		<menu label="Manipolazione voce" name="VoiceMorphing">
+			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
+			<menu_item_check label="Anteprima..." name="Preview"/>
+			<menu_item_call label="Abbonati..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesture..." name="Gestures"/>
-		<menu_item_call label="Amici" name="My Friends"/>
-		<menu_item_call label="Gruppi" name="My Groups"/>
-		<menu_item_call label="Persone vicine" name="Active Speakers"/>
+		<menu_item_check label="Amici" name="My Friends"/>
+		<menu_item_check label="Gruppi" name="My Groups"/>
+		<menu_item_check label="Persone vicine" name="Active Speakers"/>
 		<menu_item_call label="Blocca lista" name="Block List"/>
 	</menu>
 	<menu label="Mondo" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Acquista" name="Menu Object Buy"/>
 			<menu_item_call label="Prendi" name="Menu Object Take"/>
 			<menu_item_call label="Prendi copia" name="Take Copy"/>
-			<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opzioni" name="Options">
 			<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Istruzioni..." name="How To"/>
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guida dell&apos;utente" name="User’s guide"/>
+		<menu_item_call label="Base di conoscenza" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forum della comunità" name="Community Forums"/>
+		<menu_item_call label="Portale assistenza" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
 		<menu_item_call label="Segnala abuso" name="Report Abuse"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
@@ -336,9 +344,14 @@
 				<menu_item_call label="Alterna la geometria dei personaggi" name="Toggle Character Geometry"/>
 				<menu_item_check label="Consenti selezione avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocità animazione" name="Animation Speed">
+				<menu_item_call label="Accelera tutte le animazioni del 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Rallenta tutte le animazioni del 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Ripristina la velocità di tutte le animazioni" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Forza i parametri sui valori predefiniti" name="Force Params to Default"/>
 			<menu_item_check label="Informazioni sull&apos;animazione" name="Animation Info"/>
-			<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
 			<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 bersaglio" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index d5fdde4e7d..8adbebb62a 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -513,6 +513,24 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://support.amd.com/it/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.nvidia.it/Download/index.aspx?lang=it
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -1548,10 +1566,13 @@ Vuoi cancellare quell&apos;elemento?
 		Impossibile offrire l&apos;amicizia in questo momento. Riprova fra poco.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		È stata impostata la modalità Non disponibile.
-La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino.
-		<usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Non disturbare è attivo.  Non riceverai la notifica delle comunicazioni in arrivo.
+
+- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze &gt; Generali).
+- Le offerte di teleport verranno rifiutate.
+- Le chiamate voce verranno rifiutate.
+		<usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l&apos;offerta.
@@ -2039,6 +2060,10 @@ Trasferisci gli elementi nell&apos;inventario?
 		Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account?
 		<usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione.  Tutti i partecipanti riceveranno notifiche per la nuova conversazione.
+		<usetemplate ignoretext="Conferma l&apos;aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Confermi di voler uscire?
 		<usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/>
@@ -2113,14 +2138,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 			<button ignore="Never Replace" name="No" text="Annulla"/>
 		</form>
 	</notification>
-	<notification label="Avviso di &apos;Occupato&apos;" name="BusyModePay">
-		Sei in modalità &apos;Occupato&apos;, ciò significa che non riceverai ciò che attendi per questo pagamento.
+	<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
+		Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
 
-Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
+Vuoi disattivare la modalità Non disturbare prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="OK"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Abbandona"/>
+			<ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/>
+			<button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/>
+			<button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2255,11 +2280,8 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 	<notification name="GroupNotice">
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
@@ -2487,13 +2509,6 @@ Qui non puoi volare.
 	<notification name="DynamicPathfindingDisabled">
 		Il pathfinding dinamico non è attivato in questa regione.  Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento.  Per fare in modo che gli oggetti in movimento si comportino correttamente, fai clic sul pulsante &quot;Rebake regione&quot;.  Per maggiori informazioni, seleziona la guida
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Guida" ignoretext="Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Si è verificato un errore.  Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione.  A volte il problema viene risolto uscendo ed eseguendo nuovamente l&apos;accesso.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2754,9 +2769,9 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+		Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
   
-Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
+Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
 			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
@@ -3338,4 +3353,633 @@ Tentativo annullato.
 		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
 		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelato.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] ti ha scongelato.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar scongelato.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		La congelazione non ha avuto successo perché non hai le autorizzazioni dell&apos;amministratore per quel lotto.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Non sei più congelato, puoi continuare.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Non puoi congelare quell&apos;utente.
+	</notification>
+	<notification name="NowOwnObject">
+		Sei ora il proprietario dell&apos;oggetto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Non puoi rezzare l&apos;oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno.  Usa lo strumento terreno per visualizzare a chi appartiene il terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Oggetto non razzato perché ci sono troppe richieste.
+	</notification>
+	<notification name="SitFailCantMove">
+		Non puoi sederti perché al momento non puoi muoverti.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Non puoi sederti perché non ti è consentito entrare in quel terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Proba ad avvicinarti.  Non puoi sederti su un oggetto perché
+non è nella stessa regione in cui ti trovi.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Impossibile creare il nuovo oggetto. La regione è piena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Non puoi creare alberi ed erba su terreni che non sono di tua proprietà.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Copia non riuscita perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; non può essere trasferito a te.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; contribuisce al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicato senza oggetto principale selezionato.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossibile duplicare gli oggetti perché la regione è piena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Impossibile creare l&apos;oggetto perché 
+il lotto è pieno.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Tentativo di rezzare un oggetto non riuscito.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossibile creare un oggetto che ha causato problemi in questa regione.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		L&apos;oggetto dell&apos;inventario è stato aggiunto alla blacklist.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Ricerca terreno bloccata.
+Hai eseguito troppe ricerche terreno in un breve tempo.
+Riprova tra un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sei deceduto e sei stato teleportato alla tua posizione iniziale
+	</notification>
+	<notification name="EjectComingSoon">
+		Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Non puoi entrare in questa regione perché 
+il server è pieno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Opzione Salva nell&apos;inventario disattivata
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché l&apos;oggetto da cui è stato razzato non esiste più.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossibile riportare &apos;[OBJ_NAME]&apos; nell&apos;inventario -- questa operazione è stata disattivata.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Non puoi copiare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La rimozione dell&apos;oggetto &apos;[OBJ_NAME]&apos; dal simulatore non è consentita dal sistema delle autorizzazioni.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Non puoi salvare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Non puoi salvare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere copiato.
+	</notification>
+	<notification name="NoModNoTaking">
+		Non puoi prendere l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Errore interno: Tipo di destinazione sconosciuto.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Cancellazione non riuscita perché l&apos;oggetto non è stato trovato.
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Non puoi espellere quell&apos;utente.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="HomePositionSet">
+		Posizione di base impostata.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar espulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		L&apos;espulsione non ha avuto successo perché non hai l&apos;autorizzazione dell&apos;amministratore del lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l&apos;oggetto su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché nell&apos;altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Non hai l&apos;autorizzazione necessaria per modificare questa immagine
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossibile attivare la fisica per oggetti keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossibile attivare la fisica per l&apos;oggetto -- risorse di terreno insufficienti.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Aggiunta elemento non riuscita
+	</notification>
+	<notification name="UnableEditItem">
+		Impossibile modificare questo elemento.
+	</notification>
+	<notification name="NoPermToEdit">
+		Non sei autorizzato a modificare questo elemento.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Non ti è permesso copiare quell&apos;inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossibile salvare i contenuti dell&apos;oggetto: L&apos;elemento non esiste più.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossibile salvare i contenuti dell&apos;oggetto: Nell&apos;inventario esiste già un elemento con quel nome.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossibile salvare i contenuti dell&apos;oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
+	</notification>
+	<notification name="TooManyScripts">
+		Troppi script.
+	</notification>
+	<notification name="UnableAddScript">
+		Aggiunta script non riuscita.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Il server degli asset non ha inviato una risposta entro il tempo massimo.  Oggetto restituito al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In questa regione non sono attivate le forme per la fisica.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossibile impostare le proprietà della fisica per quel tipo di oggetto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		impossibile impostare un prim principale senza forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In questa regione non sono attivati i materiali per la fisica.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		I materiali per la fisica possono essere modificati solo i prim principali.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		L&apos;impostazione dei materiali per la fisica nei caratteri non è ancora supportata.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Almeno una delle proprietà dei materiali per la fisica non è valida.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Non puoi alterare il tipo di punto di un oggetto con reticolo
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Non puoi alterare la forma di un oggetto con reticolo
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Non puoi entrare in questa regione perché è piena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Collegamento non riuscito -- i proprietari non corrispondono
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Collegamento non riuscito -- troppe primitive.
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Collegamento non riuscito -- niente di collegabile.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Collegamento non riuscito -- troppi personaggi con pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Collegamento non riuscito -- risorse terreno non sufficienti
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		L&apos;oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sei stato teleportato nella posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos; del lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sei stato teleportato nella tua posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di un utente sconosciuto.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Impossibile creare l&apos;oggetto richiesto. La regione è piena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Non puoi collegare più oggetti a un singolo luogo.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Non puoi creare oggetti multipli in questa posizione.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Impossibile creare l&apos;oggetto richiesto. L&apos;oggetto non è presente nel database.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Impossibile creare l&apos;oggetto richiesto. Tempo scaduto per la richiesta. Riprova.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Impossibile creare l&apos;oggetto richiesto. Riprova.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Rezzing non riuscito. Il caricamento dell&apos;oggetto richiesto è durato troppo a lungo.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Non puoi creare piante su questo terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossibile ripristinare l&apos;oggetto. Nessuna posizione trovata nel mondo virtuale.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossibile rezzare l&apos;oggetto perché i dati del reticolo non sono validi.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossibile rezzare l&apos;oggetto perché ci sono già troppi script in questa regione.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione.
+	</notification>
+	<notification name="CantCreateObject">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parametri oggetto non validi
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione.
+	</notification>
+	<notification name="CantChangeShape">
+		Non ti è consentito modificare questa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Assegnazione non riuscita perché non hai l&apos;autorizzazione necessaria per assegnare oggetti per il tuo gruppo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossibile collegare l&apos;oggetto perché un avatar è seduto sopra.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Alberi ed erba non possono essere indossati come collegati.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossibile collegare oggetti di proprietà di un gruppo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Non puoi collegare oggetti che non sono di tua proprietà.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossibile collegare oggetti che contribuiscono a navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		L&apos;oggetto non può essere collegato perché non sei autorizzato a muoverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Non puoi lasciare elementi collegati con reticolo. Separa nell&apos;inventario e quindi rezza nel mondo virtuale.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Impossibile rimuovere l&apos;elemento collegato: non hai l&apos;autorizzazione necessaria per rimuoverlo qui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Impossibile rimuovere l&apos;elemento collegato: risorse terreno disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Non puoi lasciare l&apos;oggetto qui.  Il lotto è pieno.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Limita i parametri per la cancellazione.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Impossibile caricare l&apos;asset.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Utente da teleportare alla posizione iniziale non trovato
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		richiesta superpoteri non riuscita
+	</notification>
+	<notification name="GenericRequestFailed">
+		richiesta generica non riuscita
+	</notification>
+	<notification name="CantUploadPostcard">
+		Impossibile caricare la cartolina.  Riprova più tardi.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		I dettagli dell&apos;inventario per la notifica di gruppo non sono stati trovati.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossibile inviare la notifica di gruppo -- non consentita.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossibile inviare la notifica di gruppo -- impossibile costruire l&apos;inventario.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossibile analizzare l&apos;inventario nella notifica.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Caricamento terreno non riuscito.
+	</notification>
+	<notification name="TerrainFileWritten">
+		File terreno scritto.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		File terreno generato, avvio del download...
+	</notification>
+	<notification name="TerrainBaked">
+		Baking terreno completata.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Devi aggiornare il Viewer per poter acquistare questo lotto.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Impossibile acquistare, questo lotto non è in vendita.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Impossibile acquistare. Il prezzo o l&apos;area del terreno sono stati cambiati.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Non sei l&apos;acquirente autorizzato di questo lotto.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Non puoi acquistare questo lotto perché è in attesa di autorizzazione all&apos;acquisto
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		hai selezionato terreni con proprietari diversi. Seleziona un&apos;area più piccola e riprova.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Non sono stati selezionati abbastanza lotti affittati da collegare.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -&gt; Segnala bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Impossibile suddividere il terreno. È stato selezionato l&apos;intero lotto.\nProva a selezionare un pezzo di terreno più piccolo.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Il terreno è stato diviso.
+	</notification>
+	<notification name="PassPurchased">
+		Hai acquistato un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Nella regione non sono permessi gli annunci pubblicitari.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Il tuo pass per questo terreno è quasi scaduto.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Nessuna superficie adatta a sedersi, prova un altro luogo.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Non c&apos;è posto per sedersi, prova un altro luogo.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai l&apos;autorizzazione necessaria.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Non puoi assegnare terreno di proprietà di un gruppo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		L&apos;acquisto dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		L&apos;acquisto dell&apos;inventario non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Non hai abbastanza L$ per acquistare un pass per questo terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Al momento non puoi acquistare un pass.  Riprova più tardi.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Impossibile creare l&apos;oggetto perché il lotto è pieno.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossibile creare il punto di riferimento per l&apos;evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		I tuoi superpoteri hanno interrotto la congelazione.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Richiesta di poteri speciali non riuscita. La richiesta è stata registrata.
+	</notification>
+	<notification name="ExpireExplanation">
+		Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta.
+	</notification>
+	<notification name="DieExplanation">
+		Il sistema non è in grado di elaborare la tua richiesta.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Denaro insufficiente per creare una primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Denaro insufficiente per creare un oggetto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Posizione iniziale ripristinata perché non era valida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="SetHomePosition">
+		Posizione di base impostata.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossibile derazzare l&apos;oggetto a causa di un errore nell&apos;inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Impossibile creare l&apos;inventario richiesto.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Impossibile creare la cartella dell&apos;inventario richiesta.
+	</notification>
+	<notification name="CantCreateInventory">
+		Impossibile creare quell&apos;inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Impossibile creare il punto di riferimento.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Il vestiario non può essere creato in questo momento. Riprova tra un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventario non è in vendita.
+	</notification>
+	<notification name="CantFindInvItem">
+		Impossibile trovare l&apos;elemento nell&apos;inventario.
+	</notification>
+	<notification name="CantFindObject">
+		Impossibile trovare l&apos;oggetto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Non si capisce chi deve essere pagato.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Non puoi dare L$ a oggetti pubblici.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Creazione inventario non riuscito per un oggetto nel mondo virtuale.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un errore interno ha impedito l&apos;aggiornamento del Viewer.  Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Non puoi creare prim grandi che intersecano altri giocatori.  Riprova quando gli altri giocatori si sono spostati.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file.
+		<usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L&apos;elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati.
+		<usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossibile spostare i file. Il percorso precedente è stato ripristinato.
+		<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index ede19b9e5a..cfceb5b982 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
 	<icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
index 610f561a65..7ca2d3b57b 100644
--- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Blocca lista
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
-	<button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/>
-	<button label="Blocca l&apos;oggetto per nome..." label_selected="Blocca l&apos;oggetto per nome..." name="Block object by name..."/>
-	<button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/>
+		<menu_button name="view_btn" tool_tip="Opzioni Ordina"/>
+		<menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/>
+		<button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ca6b65300a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(caricamento in corso)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..624eaa639c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/>
+	<icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/>
+	<button name="delete_btn" tool_tip="Elimina questo elemento"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
index 7cdc4c7ff6..72e644008c 100644
--- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Sconosciuto"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index f903ae6e2c..e1468db76e 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -14,81 +14,53 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_filtered_friends_msg">
 		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
-	<string name="people_filter_label" value="Filtro persone"/>
-	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtro persone" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
-		<panel label="I MIEI AMICI" name="friends_panel">
+		<panel label="AMICI" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtro persone" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="I MIEI GRUPPI" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
-				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
+		<panel label="GRUPPI" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtro gruppi" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/>
+				<menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
+				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtro persone" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
+		<panel label="BLOCCATO" name="blocked_panel">
+			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 0c9c4027e5..c2ac6e97a9 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<text name="font_size">
-		Dimensioni caratteri:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Piccola" name="radio" value="0"/>
-		<radio_item label="Media" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
-	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
-	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
-	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostra gli IM in:
-	</text>
-	<text name="requires_restart_label">
-		(richiede il riavvio)
-	</text>
-	<radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)">
-		<radio_item label="Finestre separate" name="radio" value="0"/>
-		<radio_item label="Schede" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Attiva popup per chat in arrivo:
-	</text>
-	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
-	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
-	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
-	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Dimensioni caratteri:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Piccolo" name="Small" value="0"/>
+			<item label="Medio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notifiche
+		</text>
+		<text name="friend_ims">
+			IM degli amici:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM non di amici:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM conferenza:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat di gruppo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat nei dintorni:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Riproduci suono:
+		</text>
+		<check_box label="Nuova conversazione" name="new_conversation"/>
+		<check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/>
+		<check_box label="Offerta di Teleport" name="teleport_offer"/>
+		<check_box label="Offerta inventario" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Cancella registro..." name="clear_log"/>
+		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
+		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
+	</panel>
 	<button label="Traduzione..." name="ok_btn"/>
 	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
 	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 90a833471c..45cc06c2ea 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="mai" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Risposta in modalità occupato:
+		Risposta Non disturbare:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 8a0f93e650..5f912dd126 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Acquista oggetto" name="Buyobject"/>
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
+			<combo_box.item label="Ingrandisci" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index fb1e387468..f95318542b 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=it-IT&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
@@ -616,8 +616,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AvatarAway">
 		Assente
 	</string>
-	<string name="AvatarBusy">
-		Occupato
+	<string name="AvatarDoNotDisturb">
+		Non disturbare
 	</string>
 	<string name="AvatarMuted">
 		Mutato
@@ -853,6 +853,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ST_NO_JOINT">
 		Impossibile trovare ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat nei dintorni
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat nei dintorni)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -916,6 +922,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
+	<string name="AgentNameSubst">
+		(Tu)
+	</string>
 	<string name="TeleportYourAgent">
 		Teleportarti
 	</string>
@@ -1000,18 +1009,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="dictionary_files">
 		Dizionari
 	</string>
-	<string name="AvatarSetNotAway">
-		Imposta come non assente
-	</string>
-	<string name="AvatarSetAway">
-		Imposta come assente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Imposta come non occupato
-	</string>
-	<string name="AvatarSetBusy">
-		Imposta come occupato
-	</string>
 	<string name="shape">
 		Figura corporea
 	</string>
@@ -1968,8 +1965,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="PanelContentsNewScript">
 		Nuovo script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
+	<string name="DoNotDisturbModeResponseDefault">
+		Questo residente ha attivato la modalità &apos;Non disturbare&apos; e vedrà il tuo messaggio più tardi.
 	</string>
 	<string name="MuteByName">
 		(In base al nome)
@@ -2082,9 +2079,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenuto
-	</string>
 	<string name="AcquiredItems">
 		Oggetti acquisiti
 	</string>
@@ -3799,7 +3793,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Regione generale
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visibili e chat consentita fuori di questo lotto
+		Gli avatar in questo lotto non possono essere visti o sentiti da avatar all&apos;esterno del lotto
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione.
@@ -3876,6 +3870,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Per vedere questo messaggio, devi deselezionare &apos;Solo amici e gruppi possono chiamarmi o mandarmi IM&apos; in Preferenze/Privacy.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
@@ -3885,6 +3885,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Ti sei collegato alla chiamata in voce
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità &apos;Non disturbare&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] ha iniziato una chiamata vocale
 	</string>
@@ -3897,6 +3900,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Chiusa la chiamata
 	</string>
+	<string name="conference-title">
+		Chat con più persone
+	</string>
 	<string name="conference-title-incoming">
 		Chiamata in conferenza con [AGENT_NAME]
 	</string>
@@ -4769,6 +4775,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversazioni
+	</string>
 	<string name="Command_Compass_Label">
 		Bussola
 	</string>
@@ -4844,6 +4853,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Tooltip">
 		Chatta con persone vicine usando il testo
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversa con chiunque
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bussola
 	</string>
@@ -4973,4 +4985,13 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
new file mode 100644
index 0000000000..98b1a59a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="会話ログ">
+	<panel name="buttons_panel">
+		<filter_editor label="人をフィルター" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ea0b23de48
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="会話:">
+	<floater.string name="Title">
+		会話:[NAME]
+	</floater.string>
+	<text name="page_label" value="ページ"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index 06b65e27f0..a155efdc1e 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="会話"/>
+<multi_floater name="floater_im_box" title="会話">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
+					<button name="add_btn" tool_tip="新しい会話を開始"/>
+					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
+					<text name="stub_textbox">
+						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index dfa1c85ca2..a44c843df7 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="宛先" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
+	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
+	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
+	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
+				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
+				<button name="close_btn" tool_tip="この会話を終了する"/>
+				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="宛先" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index f152fcd738..308f6f9a3d 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		匿名ユーザー
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		がコールしています。
+		からコールを受けています。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		がコンファレンスチャットで、ボイスチャットに参加しました。
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
+		コールに応答すると、現在のボイスチャットから切断されます。
 	</text>
-	<button label="はい" label_selected="はい" name="Accept"/>
-	<button label="いいえ" label_selected="いいえ" name="Reject"/>
-	<button label="IM" name="Start IM"/>
+	<button label="取る" label_selected="取る" name="Accept"/>
+	<button label="無視" label_selected="無視" name="Reject"/>
+	<button label="代わりに IM を開く" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index ec107f3e6b..9733c61918 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				表示：
 			</text>
-			<check_box label="世界" name="show_world"/>
+			<check_box label="テスト" name="show_world"/>
 			<check_box label="可動物のみ" name="show_world_movables_only"/>
 			<check_box label="ナビメッシュ" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 3773812bb6..37233d3e68 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="ライブプレビュー" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="プレビュー無効"/>
 	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
 	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..44e96c35ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ボイスチャットの音量">
+	<slider label="ボイスチャット" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index ee675e143b..b38ea9331a 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィング">
+<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
 	<string name="no_voice_effect">
 		（ボイスモーフィングなし）
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
new file mode 100644
index 0000000000..a380615d5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ボイス音量">
+	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index a071abbd2e..07bcefd9b3 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
new file mode 100644
index 0000000000..c7df20d252
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="会話を終える" name="close_conversation"/>
+	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
+	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="フレンドを追加" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+	<menu_item_call label="グループ情報" name="group_profile"/>
+	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
+	<menu_item_call label="グループから脱退する" name="leave_group"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
+		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..c9d4f947a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="ボイスコール..." name="Call"/>
+	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="Invite"/>
+	<menu_item_call label="地図" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..bd4812603f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
+	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
new file mode 100644
index 0000000000..55cd6610f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..222a741718
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="簡略表示" name="compact_view"/>
+	<menu_item_check label="詳細表示" name="expanded_view"/>
+	<menu_item_check label="時間を表示" name="IMShowTime"/>
+	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 8c4f328661..6448e9244e 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
 	<menu_item_call label="ブロック..." name="Block"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
+	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 2bcbe1915b..1969ae2a10 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="髪" name="New Hair"/>
 		<menu_item_call label="目" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="フォルダをすべて開く" name="expand"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
new file mode 100644
index 0000000000..5816351d9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
+	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
+	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
+	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
+	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
+	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
+	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
+	<menu_item_check label="会話ログ..." name="Conversation"/>
+	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
+	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..b5c9d11e02
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_call label="プロフィール..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..3e74b2ddff
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
+	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..4b86a353f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
new file mode 100644
index 0000000000..b95d11fdbd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
+	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 842d79dc4b..2c0c85ba28 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="ボイスコール" name="Call"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
new file mode 100644
index 0000000000..4a9e402fa4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 8d84b0e521..972ab767bf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールの表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index 3f20e5d3ab..fe85e278cf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="Add Friends"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friends"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="コール" name="call"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..b7cccc4396
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="地図を表示" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
new file mode 100644
index 0000000000..feaeba4398
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 92d118a5ae..72722db7cc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
+	<menu_item_call label="プロフィールを表示" name="show_agent"/>
+	<menu_item_call label="IM を送信..." name="send_im"/>
+	<menu_item_call label="フレンドを追加..." name="add_friend"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index d6a048dcfc..9e340e3239 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
+	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index e60e6781c6..6f650242b4 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="ログイン" name="Status">
-			<menu_item_call label="一時退席中" name="Set Away"/>
-			<menu_item_call label="取り込み中" name="Set Busy"/>
-		</menu>
+		<menu label="ログイン" name="Status"/>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
 		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
 		<menu_item_call label="マイアカウント..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="チャット..." name="Nearby Chat"/>
+		<menu_item_check label="会話..." name="Conversations"/>
+		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
-		<menu_item_check label="ボイス設定..." name="Nearby Voice"/>
-		<menu_item_check label="ボイスモーフィング..." name="ShowVoice"/>
+		<menu label="ボイスモーフィング" name="VoiceMorphing">
+			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
+			<menu_item_check label="プレビュー..." name="Preview"/>
+			<menu_item_call label="申し込む..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_call label="フレンド" name="My Friends"/>
-		<menu_item_call label="グループ" name="My Groups"/>
-		<menu_item_call label="近くにいる人" name="Active Speakers"/>
+		<menu_item_check label="フレンド" name="My Friends"/>
+		<menu_item_check label="グループ" name="My Groups"/>
+		<menu_item_check label="近くにいる人" name="Active Speakers"/>
 		<menu_item_call label="リストをブロック" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="買う" name="Menu Object Buy"/>
 			<menu_item_call label="取る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
-			<menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="オプション" name="Options">
 			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="ハウツー..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
+		<menu_item_call label="ユーザーガイド" name="User’s guide"/>
+		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
+		<menu_item_call label="日本語サポートページ" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
 		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
@@ -385,9 +393,14 @@
 				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
 				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="アニメーションのスピード" name="Animation Speed">
+				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
+				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
+				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
+				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
 			<menu_item_check label="アニメーション情報" name="Animation Info"/>
-			<menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
 			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
 			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
 			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index d5cff18a24..356506f191 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -538,6 +538,24 @@ L$ が不足しているのでこのグループに参加することができ
 		</url>
 		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -1582,10 +1600,13 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		現在フレンドシップを送れません。数分後にもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		取り込み中モードになりました。
-チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
-		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		「通知を受けない」がオンになります。着信通信はあなたには通知されません。
+
+- 他の住民は「通知を受けない」の応答（「設定」&gt;「一般」で設定）を受け取ることになります。
+- テレポートのオファーはすべて受け取り拒否となります。
+- ボイスコールは拒否されます。
+		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
@@ -2076,6 +2097,10 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		終了しようとしています。続けますか？
 		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
@@ -2153,14 +2178,14 @@ Linden Lab
 			<button ignore="交換しない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
-	<notification label="取り込み中の警告" name="BusyModePay">
-		現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。
+	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
+		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
 
-この取引を行うために「取り込み中」の設定を解除しますか？
+このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/>
-			<button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/>
-			<button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/>
+			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
+			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
+			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2296,11 +2321,8 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="GroupNotice">
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオンラインです
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオフラインです
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2530,13 +2552,6 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="DynamicPathfindingDisabled">
 		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。移動オブジェクトを正しく動作させるには、「地域の再構築」ボタンをクリックします。詳しい情報は見るには「ヘルプ」を選択してください。
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="ヘルプ" ignoretext="この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。" name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2797,9 +2812,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		警告：オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
+		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
   
-このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
+そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
 		<form name="form">
 			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
@@ -3378,4 +3393,627 @@ M キーを押して変更します。
 		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
 		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		アバターがフリーズされています。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] によってフリーズが解除されています。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		アバターのフリーズが解除されました。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		その区画の管理権限を持っていないため、フリーズに失敗しました。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		フリーズ期間が切れました。仕事に戻ってください。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		残念ながら、そのユーザーをフリーズできません。
+	</notification>
+	<notification name="NowOwnObject">
+		これで、オブジェクト [OBJECT_NAME] の所有者になりました
+	</notification>
+	<notification name="CantRezOnLand">
+		この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		リクエストが多すぎて、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="SitFailCantMove">
+		今回移動できなかったため、座ることができません。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		その土地に対して許可を受けていないため、座ることができません。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		新しいオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		所有していない土地に木や草を植えることはできません。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーする権限がないため、コピーに失敗しました。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をあなたに転送できないため、コピーに失敗しました。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; がナビメッシュに貢献しているため、コピーに失敗しました。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		ルートオブジェクトを選択せずに複製します。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		リージョンが埋まっているため、オブジェクトのコピーを作成することができません。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		区画がいっぱいのため、
+オブジェクトを作成できません。
+	</notification>
+	<notification name="RezAttemptFailed">
+		オブジェクトへの Rez の試みに失敗しました。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		このリージョンで問題を引き起こすアイテムは作成できません。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		その持ち物アイテムはブラックリストに登録されています。
+	</notification>
+	<notification name="NoCanRezObjects">
+		現在あなたにはオブジェクトを作成するための許可がありません。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地の検索がブロックされました。
+短期間に多くの土地を検索したためです。
+しばらくしてから再度お試しください。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		死んでしまったので、ホームにテレポートされました。
+	</notification>
+	<notification name="EjectComingSoon">
+		ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。
+	</notification>
+	<notification name="NoEnterServerFull">
+		サーバーが埋まっているため、
+このリージョンに入場することはできません。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「「持ち物」に保存」が無効になっています。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		オブジェクト &apos;[DEST_NAME]&apos; を修正する権限がないため、オブジェクトのコンテンツに &apos;[OBJ_NAME]&apos; を保存できません。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		インベントリに &apos;[OBJ_NAME]&apos; を保存することはできません - この操作が無効になっています。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		シミュレータからのオブジェクト &apos;[OBJ_NAME]&apos; の削除は、権限システムによって無効にされています。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーできないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoModNoTaking">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを取得できません。
+	</notification>
+	<notification name="RezDestInternalError">
+		内部エラー: 不明な宛先タイプ。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		オブジェクトが見つからないため削除できませんでした。
+	</notification>
+	<notification name="SorryCantEjectUser">
+		残念ながら、そのユーザーを追放することはできません。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="HomeLocationLimits">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="HomePositionSet">
+		家の配置の設定。
+	</notification>
+	<notification name="AvatarEjected">
+		アバターが追放されました。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		その区画の管理権限がないため、追放できませんでした。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		区画が埋まっているため、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		オブジェクト &apos;[OBJECT_NAME]&apos; は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		この区画でこのオブジェクトのリソースが不足しているため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		不明な理由により、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		そのオブジェクトを変更する権限がありません
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		キーフレームオブジェクトのために物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		土地のリソースが足りないため、オブジェクトの物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+	</notification>
+	<notification name="UnableAddItem">
+		アイテムを追加できません!
+	</notification>
+	<notification name="UnableEditItem">
+		これは編集できません!
+	</notification>
+	<notification name="NoPermToEdit">
+		これを編集する許可がありません。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		そのインベントリをコピーすることは許可されません。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。
+	</notification>
+	<notification name="TooManyScripts">
+		スクリプトが多すぎます。
+	</notification>
+	<notification name="UnableAddScript">
+		テキストを追加できません!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		このリージョンでは、物理的シェイプが有効にされていません。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		そのオブジェクトタイプの物理的プロパティを設定できません。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		ルートプリムを設定できないため、シェイプがありません。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		このリージョンでは、物理的素材が有効にされていません。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		物理的素材を調整できるのは、ルートプリムだけです。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		キャラクターへの物理的素材の設定はまだサポートされていません。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定した物理的素材のプロパティが 1 つ以上無効です。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		メッシュオブジェクトの縫い目のタイプを変更することはできません。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		メッシュオブジェクトの形状を変更することはできません
+	</notification>
+	<notification name="FullRegionCantEnter">
+		リージョンが埋まっているため、\nこのリージョンに入場できません。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		リンクエラー -- 所有者が違います
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		リンクエラー -- 編集権限がありません。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		リンクエラー -- プリミティブが多すぎます。
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		リンクエラー -- コピーなしと転送なしをリンクできません。
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		リンクエラー -- リンクできるものがありません。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		リンクエラー -- パスファインディングの文字数が多すぎます
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		リンクエラー -- 土地のリソースが足りません
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはホームにテレポートされました。
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		​オブジェクト ​&apos;[OBJECT_NAME]&apos; によって、あなたはホームへテレポートされています。
+	</notification>
+	<notification name="TeleportedByAttachment">
+		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		[OWNER_ID] が所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		不明なユーザーが所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		1 つの場所に複数のオブジェクトを着用することはできません。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		ここでは、複数のオブジェクトを作成することはできません。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		要求されたオブジェクトを作成できません。もう一度お試しください。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		この土地に木を植えることはできません。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		オブジェクトをリストアできません。ワールドの位置が見つかりません。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		メッシュデータが無効なため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		現在のアクセス権限では、そこにオブジェクトを作成できません。
+	</notification>
+	<notification name="CantCreateObject">
+		現在あなたにはオブジェクト作成する許可がありません。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無効なオブジェクトパラメーター
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+	</notification>
+	<notification name="CantChangeShape">
+		あなたにはこのシェイプを変更する許可がありません。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		現在のアクセス権限では、ここにオブジェクトを取得できません。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		現在のアクセス権限では、ここでオブジェクトを購入できません。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		木や草をアタッチメントとして着用できません。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		グループが所有しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		所有していないオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		ナビメッシュに貢献しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		ここにオブジェクトをドロップできません。区画が埋まっています。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		削除パラメーターを絞ってください。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		資産をアップロードできません。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		ホームをテレポートするユーザーが見つかりませんでした。
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		過剰なリクエストが失敗しました
+	</notification>
+	<notification name="GenericRequestFailed">
+		一般的なリクエストに失敗しました
+	</notification>
+	<notification name="CantUploadPostcard">
+		ポストカードをアップロードできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		グループ通知のインベントリの詳細を取得できません。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		グループ通知の送信が許可されないため、送信できません。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		グループ通知を送信できません。持ち物を作成することもできません。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		通知内の持ち物を検出できません。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形のアップロードに失敗しました。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形ファイルが書き込まれました。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形ファイルを書き出し、ダウンロードを開始しています...
+	</notification>
+	<notification name="TerrainBaked">
+		地形がベークされました。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		この区画を購入するには、ビューワをアップデートする必要があります。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		購入することができません。この区画は販売対象ではありません。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		販売価格または土地の面積が変わったため、購入できません。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		あなたはこの区画の委任された買い手ではありません。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		すでに購入の認証を待機しているため、この区画を購入できません。
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		選択範囲のリース区画の数が少ないため、参加できません。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		土地を分解できません。\n区画が見つかりません。\n「Help」&gt;「Reprt Bug...」でレポートを行ってください。
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地が分割されています。
+	</notification>
+	<notification name="PassPurchased">
+		入場許可を購入しました。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		リージョンでは、クラシファイド広告を許可しません。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		この土地への入場許可はまもなく期限が切れます。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		配置に適した表面がありません。別の場所を試してみたください。
+	</notification>
+	<notification name="CantSitNoRoom">
+		ここには座る余地がありません。他の場所を試してください。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		権限がないため、オブジェクトを取得できませんでした。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		グループ所有の土地は、譲渡できません。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		リンデンドルが不足しているため、インベントリを購入できませんでした。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		リンデンドルが足りないため、この土地への入場許可を購入できません。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		今すぐには入場許可を購入できません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		区画が埋まっているため、オブジェクトを\n作成することができません。
+	</notification>
+	<notification name="FailedPlacingObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		イベントのためのランドマークを作成することができません。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		強力な力でフリーズを解除します。
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+	</notification>
+	<notification name="ExpireExplanation">
+		システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+	</notification>
+	<notification name="DieExplanation">
+		システムは、あなたのリクエストを処理できません。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		プリミティブ広告を出すには、資金が足りません。
+	</notification>
+	<notification name="RezObjectFailure">
+		資金が足りないため、オブジェクトを作成できません。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		ホームが不正なため、ホームの位置をリセットします。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="SetHomePosition">
+		家の配置の設定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		インベントリエラーのため、オブジェクトの Rez 解除ができません。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		リクエストされたインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		リクエストされた持ち物フォルダーを作成できません。
+	</notification>
+	<notification name="CantCreateInventory">
+		そのインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateLandmark">
+		ランドマークを作成できません。
+	</notification>
+	<notification name="CantCreateOutfit">
+		アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+	</notification>
+	<notification name="InventoryNotForSale">
+		インベントリは販売対象ではありません。
+	</notification>
+	<notification name="CantFindInvItem">
+		持ち物アイテムを見つけることができません。
+	</notification>
+	<notification name="CantFindObject">
+		オブジェクトが見つかりません。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		オブジェクトへの送金は、このリージョンでは現在無効にされています。
+	</notification>
+	<notification name="CantPayNoAgent">
+		支払いの相手を把握できませんでした。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		パブリックオブジェクトにリンデンドルを与えることはできません。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		インワールドオブジェクトでのインベントリ作成に失敗しました。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
+		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		ファイルを移動できません。以前のパスがリストアされました。
+		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 70d37c3bad..3ef8eba19f 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
 	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
 	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 5d6a6065ae..9263e5f347 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		ブロックリスト
-	</text>
-	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
-	<button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
-	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
-	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="フィルター" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
+		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
+		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
+		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..09ffb92d36
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（ローディング）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..e05a67e31d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
+	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
+	<button name="delete_btn" tool_tip="このエントリーを削除"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 4b548049c8..77d3d8f391 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="不明"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 88c31451b5..03ce87537a 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人" name="people_panel">
 	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
 	</string>
-	<string name="people_filter_label" value="人をフィルター"/>
-	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
-		<panel label="マイ フレンド" name="friends_panel">
+		<panel label="フレンド" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人をフィルター" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="マイ グループ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
-				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
+		<panel label="グループ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
+				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人をフィルター" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
+		<panel label="停止" name="blocked_panel">
+			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index b6e344ca48..ae5391c7bd 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<text name="font_size">
-		文字の大きさ：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
-	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IM の表示方法：
-	</text>
-	<text name="requires_restart_label">
-		（再起動後に反映）
-	</text>
-	<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）">
-		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
-		<radio_item label="タブ" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		受信チャットのポップアップを有効にする
-	</text>
-	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
-	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
-	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
-	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			文字の大きさ：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小規模" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大規模" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			通知
+		</text>
+		<text name="friend_ims">
+			フレンド IM:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			非フレンド IM:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			コンファレンス IM:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			グループチャット:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="なし" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			近くのチャット:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			すべての通知を一時的に受け付けないようにするには、「コミュニケート」&gt;「通知を受けない」を使用します。
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			音の再生:
+		</text>
+		<check_box label="新しい会話" name="new_conversation"/>
+		<check_box label="ボイスコールの着信" name="incoming_voice_call"/>
+		<check_box label="テレポートを渡す" name="teleport_offer"/>
+		<check_box label="アイテムのオファー" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="ログのクリア..." name="clear_log"/>
+		<button label="テキストの削除..." name="delete_transcripts"/>
+		<button label="参照..." label_selected="参照" name="log_path_button"/>
+	</panel>
 	<button label="他の言語..." name="ok_btn"/>
 	<button label="自動置換..." name="autoreplace_showgui"/>
 	<button label="スペルチェック中..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 91e1514e49..d70af7e099 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="一時退席設定なし" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		取り込み中モード時の返事：
+		「通知を受けない」応答:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index c61c73657f..4f65c8477b 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
+			<combo_box.item label="ズーム" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 50697e5500..b27904c4d7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ja-JP&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
@@ -622,8 +622,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="AvatarAway">
 		一時退席中
 	</string>
-	<string name="AvatarBusy">
-		取り込み中
+	<string name="AvatarDoNotDisturb">
+		通知を受けない
 	</string>
 	<string name="AvatarMuted">
 		ブロック中
@@ -859,6 +859,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ST_NO_JOINT">
 		ROOT または JOINT が見つかりません
 	</string>
+	<string name="NearbyChatTitle">
+		近くのチャット
+	</string>
+	<string name="NearbyChatLabel">
+		(近くのチャット)
+	</string>
 	<string name="whisper">
 		のささやき:
 	</string>
@@ -922,12 +928,15 @@ support@secondlife.com にお問い合わせください。
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
-	<string name="TeleportYourAgent">
-		あなたをテレポート
-	</string>
 	<string name="NotConnected">
 		接続されていません
 	</string>
+	<string name="AgentNameSubst">
+		(あなた)
+	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1009,18 +1018,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="dictionary_files">
 		辞書
 	</string>
-	<string name="AvatarSetNotAway">
-		一時退席中解除
-	</string>
-	<string name="AvatarSetAway">
-		一時退席中
-	</string>
-	<string name="AvatarSetNotBusy">
-		取り込み中解除
-	</string>
-	<string name="AvatarSetBusy">
-		取り込み中
-	</string>
 	<string name="shape">
 		シェイプ
 	</string>
@@ -1989,8 +1986,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
-	<string name="BusyModeResponseDefault">
-		メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。  あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
+	<string name="DoNotDisturbModeResponseDefault">
+		この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。
 	</string>
 	<string name="MuteByName">
 		（名称別）
@@ -2103,9 +2100,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDate">
 		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		内容
-	</string>
 	<string name="AcquiredItems">
 		取得アイテム
 	</string>
@@ -3877,7 +3871,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		General リージョン
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		この区画外にアバターを見えるようにして、チャットも許可
+		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
@@ -3954,6 +3948,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="IM_unblock_only_groups_friends">
 		このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。
 	</string>
+	<string name="OnlineStatus">
+		オンライン
+	</string>
+	<string name="OfflineStatus">
+		オフライン
+	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
@@ -3963,6 +3963,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="you_joined_call">
 		ボイスコールに参加しました
 	</string>
+	<string name="you_auto_rejected_call-im">
+		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
+	</string>
 	<string name="name_started_call">
 		[NAME] はボイスコールを開始します
 	</string>
@@ -3979,7 +3982,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		接続中...
 	</string>
 	<string name="conference-title">
-		アドホックコンファレンス
+		複数人チャット
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] とコンファレンスする
@@ -4859,6 +4862,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Label">
 		チャット
 	</string>
+	<string name="Command_Conversations_Label">
+		会話
+	</string>
 	<string name="Command_Compass_Label">
 		コンパス
 	</string>
@@ -4934,6 +4940,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Tooltip">
 		近くの人と文字チャットする
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		全員との会話
+	</string>
 	<string name="Command_Compass_Tooltip">
 		コンパス
 	</string>
@@ -5063,4 +5072,13 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
new file mode 100644
index 0000000000..ae7dd3c441
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
new file mode 100644
index 0000000000..97a2e8327c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSA:">
+	<floater.string name="Title">
+		CONVERSA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index 0fbb826a96..a1cea72b1e 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAS"/>
+<multi_floater name="floater_im_box" title="CONVERSAS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
+					<button name="add_btn" tool_tip="Iniciar uma nova conversa"/>
+					<button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Recolher este painel"/>
+					<text name="stub_textbox">
+						Esta conversa está em uma janela separada.   [secondlife:/// Trazer de volta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 5543ffa41d..9f6a7a06ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Para" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/>
+	<floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/>
+	<floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/>
+	<floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexão por voz"/>
+				<button name="close_btn" tool_tip="Encerrar esta conversa"/>
+				<button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Para" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 6344258fa0..1e86f847ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz?
 	</floater.string>
 	<text name="question">
-		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
+		Se você atender, será desconectado de suas conversas de voz atuais.
 	</text>
-	<button label="Aceitar" label_selected="Aceitar" name="Accept"/>
-	<button label="Rejeitar" label_selected="Rejeitar" name="Reject"/>
-	<button label="Enviar MI" name="Start IM"/>
+	<button label="Atender" label_selected="Atender" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Iniciar MI em vez disso" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index 182f2513e0..d04cf2a173 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Exibir:
 			</text>
-			<check_box label="Mundo" name="show_world"/>
+			<check_box label="Testar" name="show_world"/>
 			<check_box label="Apenas móveis" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index a75cf34a94..ba4ef0afde 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box initial_value="true" label="Visualização em tempo real" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Visualização desativada"/>
 	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..de7aa2df12
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ">
+	<slider label="Bate-papo de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index b29ca3d699..71d3c33ae5 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ">
+<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
 	<string name="no_voice_effect">
 		(Não distorcer voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
new file mode 100644
index 0000000000..dae47a99ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE VOZ">
+	<slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
index 8716992a5e..b59895573e 100644
--- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Roupas novas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
new file mode 100644
index 0000000000..01316b887d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
+	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Remover amigos" name="remove_friends"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear voz" name="block_unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+	<menu_item_call label="Perfil do grupo" name="group_profile"/>
+	<menu_item_call label="Ativar grupo" name="activate_group"/>
+	<menu_item_call label="Sair do grupo" name="leave_group"/>
+	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
+		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
+		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..616e6db46e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Chamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/>
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Oferecer teletransporte" name="teleport"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..cab81175a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por data" name="sort_by_date"/>
+	<menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/>
+	<menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
new file mode 100644
index 0000000000..a8434dc336
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo" name="Add Friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..398b890f66
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Exibição compacta" name="compact_view"/>
+	<menu_item_check label="Exibição expandida" name="expanded_view"/>
+	<menu_item_check label="Mostrar hora" name="IMShowTime"/>
+	<menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index 7af760a6ee..df224a88fa 100644
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
 	<menu_item_call label="Bloquear..." name="Block"/>
+	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
+	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 894f1d741c..3602bdaac4 100644
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Novo cabelo" name="New Hair"/>
 		<menu_item_call label="Novos olhos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Expandir todas as pastas" name="expand"/>
+	<menu_item_call label="Recolher todas as pastas" name="collapse"/>
 	<menu_item_call label="Renomear look" name="rename"/>
 	<menu_item_call label="Excluir visual" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
new file mode 100644
index 0000000000..b61108cf54
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/>
+	<menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversas..." name="Conversation"/>
+	<menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/>
+	<menu_item_check label="Configurações de tradução..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..8bbde9b38c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Desbloquear" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..e69935995c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..b80d683c7b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
new file mode 100644
index 0000000000..46caeae310
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por status" name="sort_status"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
+	<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
index 9a924ad7b9..2ba7af17cd 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver dados" name="View Info"/>
 	<menu_item_call label="Bate-papo" name="Chat"/>
-	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Chamada de voz" name="Call"/>
 	<menu_item_call label="Ativar" name="Activate"/>
 	<menu_item_call label="Sair" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
new file mode 100644
index 0000000000..637e591ae1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 7c720f262b..51464fed68 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 79edb96b1c..7f3c6ace27 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friends"/>
+	<menu_item_call label="Remover amigo..." name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ligar" name="call"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..bce015e732
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
new file mode 100644
index 0000000000..e4b368fe14
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index ba5e055124..aa0a426405 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar perfil de residente" name="show_agent"/>
+	<menu_item_call label="Exibir perfil" name="show_agent"/>
+	<menu_item_call label="Enviar MI..." name="send_im"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index c197444181..247a92567a 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/>
+	<menu_item_call label="Perfil do objeto..." name="show_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index ca378c1b58..703df84efb 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
-		</menu>
+		<menu label="Status" name="Status"/>
 		<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="Painel da conta..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
-		<menu_item_check label="Bate-papo..." name="Nearby Chat"/>
+		<menu_item_check label="Conversas..." name="Conversations"/>
+		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
-		<menu_item_check label="Configurações de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Distorção de voz..." name="ShowVoice"/>
+		<menu label="Distorção de voz" name="VoiceMorphing">
+			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Visualizar..." name="Preview"/>
+			<menu_item_call label="Assinar..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
 		<menu_item_call label="Lista de bloqueados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -115,7 +116,6 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Pegar" name="Menu Object Take"/>
 			<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
-			<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,6 +130,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opções" name="Options">
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
@@ -159,6 +160,13 @@
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Como..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
+		<menu_item_call label="Guia do usuário" name="User’s guide"/>
+		<menu_item_call label="Base de conhecimento" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Fóruns da comunidade" name="Community Forums"/>
+		<menu_item_call label="Portal de suporte" name="Support portal"/>
+		<menu_item_call label="Notícias do [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
@@ -336,9 +344,14 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocidade de animação" name="Animation Speed">
+				<menu_item_call label="Todas as animações 10% mais rápidas" name="All Animations 10 Faster"/>
+				<menu_item_call label="Todas as animações 10% mais lentas" name="All Animations 10 Slower"/>
+				<menu_item_call label="Redefinir todas as velocidades de animação" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animações em câmera lenta" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Dados da animação" name="Animation Info"/>
-			<menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/>
 			<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="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index ff7382bf80..d9f5e48745 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -510,6 +510,24 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://www.nvidia.com.br/Download/index.aspx?lang=br
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -1533,10 +1551,13 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Modo ocupado ativado. 
-O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua resposta de modo ocupado.  Todas as ofertas de teletransporte serão recusadas.  Todas as ofertas de inventário serão colocadas na Lixeira.
-		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Não perturbe está ativado.  Você não será notificado de comunicações recebidas.
+
+- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências &gt; Geral).
+- As ofertas de teletransporte serão recusadas.
+- Chamadas de voz serão recusadas.
+		<usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
@@ -2022,6 +2043,10 @@ Mover para o inventário o(s) item(s)?
 		Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta?
 		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada.  Todos os participantes recebem notificações sobre a nova conversa.
+		<usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Tem certeza que deseja sair?
 		<usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/>
@@ -2096,14 +2121,14 @@ Você deseja substituí-lo pelo objeto selecionado?
 			<button ignore="Never Replace" name="No" text="Não"/>
 		</form>
 	</notification>
-	<notification label="Aviso de Modo Ocupado" name="BusyModePay">
-		Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento.
+	<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
+		Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
 
-Você gostaria de deixar o modo Ocupado antes de completar esta transação?
+Deseja desativar o Não perturbe antes de concluir esta transação?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="Sim"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Não"/>
+			<ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/>
+			<button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/>
+			<button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2238,11 +2263,8 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 	<notification name="GroupNotice">
 		Assunto: [SUBJECT], Mensagem: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
@@ -2467,13 +2489,6 @@ Logo, não é possível voar aqui.
 	<notification name="DynamicPathfindingDisabled">
 		O pathfinding dinâmico não está habilitado nesta região.  Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento.  Para fazer com que os objetos em movimento se comportem corretamente, clique no botão “Recarregar região”.  Escolha “Ajuda” para obter mais informações.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Ajuda" ignoretext="A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Erro.  Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção.  Às vezes, fazer login e logout novamente resolve este problema.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2736,7 +2751,7 @@ OK?
 	<notification name="ScriptQuestionCaution">
 		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
   
-Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
+Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
 			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
@@ -3310,4 +3325,633 @@ Tentativa cancelada.
 		Você está excluindo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
 		<usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] descongelou você.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		O congelamento falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Seu congelamento expirou, vá cuidar da sua vida.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Não é possível congelar esse usuário.
+	</notification>
+	<notification name="NowOwnObject">
+		Agora você é o proprietário do objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite.  Use a ferramenta de terrenos para ver a propriedade do terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		O objeto não pode ser renderizado porque há muitas solicitações.
+	</notification>
+	<notification name="SitFailCantMove">
+		Você não pode sentar porque não pode se mover no momento.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Você não pode sentar porque não está autorizado a sentar nesse terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Tente chegar mais perto.  Não é possível sentar no objeto porque
+ele não está na mesma região que você.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Não foi possível criar um novo objeto. A região está cheia.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Você não pode criar árvores e grama em terrenos que não são sua propriedade.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		A cópia falhou porque você não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; não pode ser transferido para você.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; contribui para o navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicar sem objetos raiz selecionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Não é possível duplicar objetos porque a região está cheia.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Não é possível criar objeto porque 
+o lote está cheio.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Falha na tentativa de renderizar um objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Não é possível criar um item que causou problemas a essa região.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Esse item do inventário foi incluído na lista.
+	</notification>
+	<notification name="NoCanRezObjects">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Pesquisa de terreno bloqueada.
+Você realizou muitas pesquisas de terreno muito rápido.
+Tente novamente em instantes.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Você morreu e foi teletransportado para seu início
+	</notification>
+	<notification name="EjectComingSoon">
+		Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Você não pode entrar nesta região porque 
+o servidor está cheio.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Salvar no inventário foi desativado.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque você não tem permissão para modificar o objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no inventário -- essa operação foi desativada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Você não pode copiar sua seleção porque não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		A remoção do objeto &apos;[OBJ_NAME]&apos; do simulador é proibida pelo sistema de permissões.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Você não pode salvar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Não é possível salvar sua seleção porque o objeto &apos;[OBJ_NAME]&apos; não é copiável.
+	</notification>
+	<notification name="NoModNoTaking">
+		Você não pode levar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Erro interno: tipo de destino desconhecido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		A exclusão falhou porque o objeto não foi encontrado
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Não é possível expulsar esse usuário.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posição de início definida.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		A expulsão falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Você não está autorizado a modificar este objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Não é possível ativar propriedades físicas para objetos keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Não é possível adicionar item!
+	</notification>
+	<notification name="UnableEditItem">
+		Não é possível editar isso!
+	</notification>
+	<notification name="NoPermToEdit">
+		Não é permitido editar isso.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Não é permitido copiar esse inventário.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Não é possível salvar no conteúdo do objeto: O item não existe mais.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Muitos scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Não é possível adicionar script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Servidor de objetos não respondeu a tempo.  Objeto retornado a sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta região não tem formas físicas ativadas.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Você não pode modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Não é possível definir as propriedades físicas neste tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Não é possível definir que um prim raiz não tenha forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta região não tem materiais físicos ativados.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Apenas prims raiz podem ter seus materiais físicos ajustados.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Ainda não há suporte para a configuração dos materiais físicos em personagens.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Uma ou mais das propriedades do material físico são inválidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Você não pode alterar o tipo de acabamento de um objeto mesh.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Você não pode alterar a forma de um objeto mesh
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Você não pode entrar nesta região porque \nela está cheia.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Falha na vinculação -- proprietários diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Falha na vinculação -- não é possível modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Ocorreu uma falha na vinculação porque você não tem permissão de edição.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Falha na vinculação -- muitos prims
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Falha na vinculação -- nada é vinculável.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Falha na vinculação -- muitos personagens com pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Falha na vinculação -- recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		O objeto usa muitos recursos físicos – sua dinâmica foi desativada.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Você foi teletransportado por um anexo em [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de um usuário desconhecido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Não foi possível criar o objeto solicitado. A região está cheia.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Não é possível anexar vários objetos a um local.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Você não pode criar vários objetos aqui.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Não foi possível criar o objeto solicitado. Tente novamente.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Falha na renderização, objeto solicitado demorou muito a carregar.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Você não pode criar plantas neste terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Não é possível renderizar o objeto porque os dados de mesh são inválidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Não foi possível renderizar objeto porque já há muitos scripts nesta região.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Seus privilégios de acesso não permitem que você crie objetos aqui.
+	</notification>
+	<notification name="CantCreateObject">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parâmetros de objeto inválidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Seus privilégios de acesso não permitem que você duplique objetos aqui.
+	</notification>
+	<notification name="CantChangeShape">
+		Você não está autorizado a alterar essa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Seus privilégios de acesso não permitem que você reivindique objetos aqui.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		A doação falhou porque você não está autorizado a doar objetos ao seu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Seus privilégios de acesso não permitem que você compre objetos aqui.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Não é possível anexar objeto porque um avatar está sentado nele.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Árvores e grama não podem ser usadas como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Não é possível anexar objetos de propriedade de um grupo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Não é possível anexar objetos que não sua propriedade.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Não é possível anexar objetos que contribuem com o navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Não é possível vincular objeto porque você não tem permissão para movê-lo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Falha ao largar anexo: você não está autorizado a largá-lo aqui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Falha ao largar anexo: recursos de terreno disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Falha ao largar anexos: recursos disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Não é possível largar objeto aqui.  O lote está cheio.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Detalhe seus parâmetros de exclusão.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Não é possível carregar objeto.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Não foi possível encontrar usuário para teletransportar para início
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		solicitação de poderes de deus falhou
+	</notification>
+	<notification name="GenericRequestFailed">
+		falha em solicitação genérica
+	</notification>
+	<notification name="CantUploadPostcard">
+		Não foi possível carregar cartão postal.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Não foi possível obter detalhes de inventário para o anúncio de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Não é possível enviar anúncio de grupo -- não permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Não é possível enviar anúncio de grupo -- não foi possível construir inventário.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Não é possível processar o inventário do anúncio.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Falha no envio de terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Arquivo de terreno gravado.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Arquivo de terreno criado, iniciando o download...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno confeccionado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Você precisa atualizar seu visualizador para comprar este lote.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Não é possível comprar, este lote não está à venda.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Não é possível comprar, o preço de venda ou a área do terreno foram alterados.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Você não é o comprador autorizado deste lote.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Você não pode comprar este lote porque já está aguardando aut. de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Não é possível criar objeto aqui porque isso sobrecarregaria o lote.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Não há lotes alugados suficientes na seleção para reunir.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -&gt; Relatar bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		O terreno foi dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Você comprou um passe.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		A região não permite classificados.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Seu passe para este terreno está prestes a expirar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Não há uma superfície adequada para sentar, tente outro local.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Não há espaço para sentar aqui, tente outro local.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		A reivindicação do objeto falhou porque você não tem permissão
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		A reivindicação do objeto falhou porque você não tem L$ suficiente.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Não é possível doar terrenos de propriedade de um grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		A compra do objeto falhou porque você não tem L$ suficientes.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		A compra do inventário falhou porque você não tem L$ suficiente
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Você não tem L $ suficientes para comprar um passe para este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Não é possível comprar passe no momento.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Não é possível criar objeto porque \no lote está cheio.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Não é possível criar marco para o evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Seus poderes de deus rompem o congelamento!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Falha na solicitação de poderes especiais. Essa solicitação foi registrada.
+	</notification>
+	<notification name="ExpireExplanation">
+		O sistema não pode processar sua solicitação no momento. A solicitação expirou.
+	</notification>
+	<notification name="DieExplanation">
+		O sistema não pode processar sua solicitação.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fundos insuficientes para criar prim.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fundos insuficientes para criar objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Redefinir Início pois o Início não era legal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posição de início definida.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Não é possível desrenderizar objeto devido a uma falha de inventário.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Não é possível criar o inventário solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Não é possível criar a pasta de inventário solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		Não é possível criar esse inventário.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Não é possível criar marco.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Não é possível criar roupa agora. Tente novamente em instantes.
+	</notification>
+	<notification name="InventoryNotForSale">
+		O inventário não está à venda.
+	</notification>
+	<notification name="CantFindInvItem">
+		Não é possível encontrar item do inventário.
+	</notification>
+	<notification name="CantFindObject">
+		Não foi possível encontrar objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Transferências de dinheiro para objetos estão desativadas para esta região no momento.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Não foi possível descobrir a quem pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Não é possível dar L$ a objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Falha na criação de inventário de objetos do mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Um erro interno impediu que seu visualizador fosse atualizado corretamente.  O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Não é possível criar grandes prims que interceptam outros jogadores.  Tente novamente quando os outros jogadores tiverem se movido.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo.
+		<usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos.
+		<usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Não foi possível mover arquivos. Caminho anterior restaurado.
+		<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index b444593af8..22eb23ebc5 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
index c5f93d719a..2fcf6b9932 100644
--- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de bloqueados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
-	<button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/>
-	<button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/>
-	<button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrar" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/>
+		<menu_button name="view_btn" tool_tip="Opções de ordenação"/>
+		<menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/>
+		<button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..f56168c962
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(carregando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..74daded58f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/>
+	<icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/>
+	<button name="delete_btn" tool_tip="Remover esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index 19c34d2f10..0490878507 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index f3af15b991..babb48c208 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -14,81 +14,53 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_filtered_friends_msg">
 		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
-	<string name="people_filter_label" value="Filtro de pessoas"/>
-	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
-		<panel label="MEUS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEUS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opções"/>
-				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
-				<button name="activate_btn" tool_tip="Ativar o grupo selecionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
+				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADA" name="blocked_panel">
+			<panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 350d53b81c..baf14c2c23 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<text name="font_size">
-		Tamanho da fonte:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Pequeno" name="radio" value="0"/>
-		<radio_item label="Médio" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
-	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
-	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar MIs em:
-	</text>
-	<text name="requires_restart_label">
-		(Reinicie para ativar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
-		<radio_item label="Janelas separadas" name="radio" value="0"/>
-		<radio_item label="Guias" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Ativar pop-ups de novos bate-papos:
-	</text>
-	<check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/>
-	<check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+		<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamanho da fonte:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeno" name="Small" value="0"/>
+			<item label="Médio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notificações
+		</text>
+		<text name="friend_ims">
+			MIs de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			MIs de não amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			MIs de conferências:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Bate-papo de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Bate-papo local:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Executar som:
+		</text>
+		<check_box label="Nova conversa" name="new_conversation"/>
+		<check_box label="Chamada de voz recebida" name="incoming_voice_call"/>
+		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventário" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Limpar registro..." name="clear_log"/>
+		<button label="Excluir transcrições..." name="delete_transcripts"/>
+		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
+	</panel>
 	<button label="Tradução..." name="ok_btn"/>
 	<button label="Substituição automática..." name="autoreplace_showgui"/>
 	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index c53aa7d5f7..8a0495f9bb 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="(nunca)" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Mensagem do modo ocupado:
+		Resposta de Não perturbe:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 3cfe0fe4f4..f0fd438cef 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Comprar objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index bc72b86020..4bf18aab70 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=pt-BR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -571,8 +571,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AvatarAway">
 		Distante
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		Não perturbe
 	</string>
 	<string name="AvatarMuted">
 		Mudo
@@ -808,6 +808,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ST_NO_JOINT">
 		Não é possível encontrar a raiz (ROOT) ou junção (JOINT).
 	</string>
+	<string name="NearbyChatTitle">
+		Bate-papo local
+	</string>
+	<string name="NearbyChatLabel">
+		(Bate-papo local)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -871,6 +877,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
+	<string name="AgentNameSubst">
+		(Você)
+	</string>
 	<string name="TeleportYourAgent">
 		Teletransportá-lo
 	</string>
@@ -955,18 +964,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="dictionary_files">
 		Dicionários
 	</string>
-	<string name="AvatarSetNotAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		deixar como não ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Deixar como ocupado
-	</string>
 	<string name="shape">
 		Silhueta
 	</string>
@@ -1923,8 +1920,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="PanelContentsNewScript">
 		Novo Script
 	</string>
-	<string name="BusyModeResponseDefault">
-		O residente para o qual escreveu está no modo &apos;ocupado&apos;, ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente ativou o &quot;Não perturbe&quot; e verá sua mensagem mais tarde.
 	</string>
 	<string name="MuteByName">
 		(por nome)
@@ -2037,9 +2034,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Conteúdo
-	</string>
 	<string name="AcquiredItems">
 		Itens adquiridos
 	</string>
@@ -3753,7 +3747,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Região em geral
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visíveis e bate-papo permitido fora deste terreno
+		Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada.
@@ -3830,6 +3824,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Para visualizar esta mensagem, você deve desmarcar &quot;Apenas amigos e grupos podem me ligar ou enviar MIs&quot; em Preferências/Privacidade.
 	</string>
+	<string name="OnlineStatus">
+		Conectado
+	</string>
+	<string name="OfflineStatus">
+		Desconectado
+	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
@@ -3839,6 +3839,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Você entrou na ligação
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Você recusou automaticamente a chamada de voz enquanto &quot;Não perturbe&quot; estava ativado.
+	</string>
 	<string name="name_started_call">
 		[NAME] iniciou uma ligação de voz
 	</string>
@@ -3851,6 +3854,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Saiu da ligação de voz
 	</string>
+	<string name="conference-title">
+		Bate-papo com várias pessoas
+	</string>
 	<string name="conference-title-incoming">
 		Conversa com [AGENT_NAME]
 	</string>
@@ -4726,6 +4732,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Label">
 		Bate-papo
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversas
+	</string>
 	<string name="Command_Compass_Label">
 		Bússola
 	</string>
@@ -4801,6 +4810,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Tooltip">
 		Bater papo com pessoas próximas usando texto
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar com todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bússola
 	</string>
@@ -4930,4 +4942,13 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="UserDictionary">
 		[Usuário]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
new file mode 100644
index 0000000000..090ac7193a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА">
+	<panel name="buttons_panel">
+		<filter_editor label="Фильтр для людей" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
new file mode 100644
index 0000000000..23225fcf56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="РАЗГОВОР:">
+	<floater.string name="Title">
+		РАЗГОВОР: [NAME]
+	</floater.string>
+	<text name="page_label" value="Страница"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
index b147cfa2b3..eba7a19cd4 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/>
+<multi_floater name="floater_im_box" title="ОБЩЕНИЕ">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/>
+					<button name="add_btn" tool_tip="Начать разговор"/>
+					<button name="speak_btn" tool_tip="Разговаривать через микрофон"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/>
+					<text name="stub_textbox">
+						Разговор отображается в отдельном окне.   [secondlife:/// Вернуть.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index 604d9dc6d3..ea110ffb44 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Кому" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/>
+	<floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/>
+	<floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/>
+	<floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/>
+	<floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/>
+	<floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<button name="add_btn" tool_tip="Добавить участника в этот разговор"/>
+				<button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/>
+				<button name="close_btn" tool_tip="Завершить этот разговор"/>
+				<button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Переводить чат" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Кому" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
index 072c20147d..3f61421d0c 100644
--- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		анонимно
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		вызывает.
+		вызывает вас.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		теперь участвует в групповом голосовом чате.
@@ -25,9 +25,9 @@
 		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</floater.string>
 	<text name="question">
-		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
+		Если вы ответите, вы покинете текущий голосовой чат.
 	</text>
-	<button label="Принять" label_selected="Принять" name="Accept"/>
-	<button label="Отклонить" label_selected="Отклонить" name="Reject"/>
-	<button label="Начать IM" name="Start IM"/>
+	<button label="Ответить" label_selected="Ответить" name="Accept"/>
+	<button label="Игнорировать" label_selected="Игнорировать" name="Reject"/>
+	<button label="Открыть IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index fa72df04fd..8faddb1805 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Показать:
 			</text>
-			<check_box label="Мир" name="show_world"/>
+			<check_box label="Тест" name="show_world"/>
 			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
 			<check_box label="Навигационная сетка" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index db37089aeb..a9a21e7d4a 100644
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
-	<check_box initial_value="истина" label="Просмотр вживую" name="apply_immediate_check"/>
+	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5a7e7a7061
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА">
+	<slider label="Голосовой чат" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
index 1eb8a94d7a..d3cef042a3 100644
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА">
+<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
 	<string name="no_voice_effect">
 		(Нет изменения голоса)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
new file mode 100644
index 0000000000..aca6bd518a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА">
+	<slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
index 0332c03a04..b7a32dfd75 100644
--- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Новая одежда" name="COF.Gear.New_Clothes"/>
-	<menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
new file mode 100644
index 0000000000..530b1ea704
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
+	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
+	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Удалить друзей" name="remove_friends"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Блокировать голос" name="block_unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+	<menu_item_call label="Профиль группы" name="group_profile"/>
+	<menu_item_call label="Активировать группу" name="activate_group"/>
+	<menu_item_call label="Покинуть группу" name="leave_group"/>
+	<context_menu label="Параметры модератора" name="Moderator Options">
+		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
+		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/>
+		<menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..3fbffbe038
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Голосовой вызов..." name="Call"/>
+	<menu_item_call label="Открыть журнал чата..." name="Chat history"/>
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="Invite"/>
+	<menu_item_call label="Карта" name="Map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Черный список" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..928146e273
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по дате" name="sort_by_date"/>
+	<menu_item_check label="Сначала друзья" name="sort_by_friends"/>
+	<menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
new file mode 100644
index 0000000000..1db0b8bae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Добавить друга" name="Add Friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Блокировать голос" name="Block/Unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..35cff8e4bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Компактный вид" name="compact_view"/>
+	<menu_item_check label="Развернутый вид" name="expanded_view"/>
+	<menu_item_check label="Показать время" name="IMShowTime"/>
+	<menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 6229b2e72f..0c50abcfbd 100644
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Профиль объекта..." name="Object Profile"/>
 	<menu_item_call label="Блокировать..." name="Block"/>
+	<menu_item_call label="Показать на карте" name="show_on_map"/>
+	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index 93dbd7d6a7..d379a17216 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Новые волосы" name="New Hair"/>
 		<menu_item_call label="Новые глаза" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Открыть все папки" name="expand"/>
+	<menu_item_call label="Закрыть все папки" name="collapse"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
 	<menu_item_call label="Удалить костюм" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
new file mode 100644
index 0000000000..851a42d428
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/>
+	<menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/>
+	<menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/>
+	<menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/>
+	<menu_item_call label="Изменить настройки..." name="chat_preferences"/>
+	<menu_item_call label="Настройки приватности..." name="privacy_preferences"/>
+	<menu_item_check label="Журнал разговора..." name="Conversation"/>
+	<menu_item_check label="Перевести локальный чат" name="Translate_chat"/>
+	<menu_item_check label="Настройки перевода..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..157f2ad5e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Разблокировать" name="unblock"/>
+	<menu_item_call label="Профиль…" name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..f42e8f8609
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/>
+	<menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..8c0150e8ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по типу" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
new file mode 100644
index 0000000000..7b2dba0539
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
+	<menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
index e734a83ef0..78d73c9d1e 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Информация" name="View Info"/>
 	<menu_item_call label="Чат" name="Chat"/>
-	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Голосовой вызов" name="Call"/>
 	<menu_item_call label="Активация" name="Activate"/>
 	<menu_item_call label="Покинуть" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
new file mode 100644
index 0000000000..cbf1c64774
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index ebce959044..d05b7e7d01 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="В друзья" name="Add Friend"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Карта" name="Map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Черный список" name="Block/Unblock"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Посмотреть журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Черный список" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
index 0e8e0d4053..88eb56c9f5 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Добавить в друзья" name="Add Friends"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить в друзья" name="add_friends"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Звонок" name="call"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..2bc353ad58
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Смотреть карту" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a009cf081f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по времени" name="sort_most"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 0ba3ee152a..230d049fad 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать профиль жителя" name="show_agent"/>
+	<menu_item_call label="Смотреть профиль" name="show_agent"/>
+	<menu_item_call label="Отправить сообщение..." name="send_im"/>
+	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 6e7800d3f5..1326db708e 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать информацию об объекте" name="show_object"/>
+	<menu_item_call label="Профиль объекта..." name="show_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d9425937c3..d6625361c5 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Статус" name="Status">
-			<menu_item_call label="Нет на месте" name="Set Away"/>
-			<menu_item_call label="Не беспокоить" name="Set Busy"/>
-		</menu>
+		<menu label="Статус" name="Status"/>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
 		<menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
-		<menu_item_check label="Чат..." name="Nearby Chat"/>
+		<menu_item_check label="Разговоры..." name="Conversations"/>
+		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
-		<menu_item_check label="Настройки голоса..." name="Nearby Voice"/>
-		<menu_item_check label="Изменение голоса..." name="ShowVoice"/>
+		<menu label="Изменение голоса" name="VoiceMorphing">
+			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
+			<menu_item_check label="Просмотр..." name="Preview"/>
+			<menu_item_call label="Подписаться..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Жесты..." name="Gestures"/>
-		<menu_item_call label="Друзья" name="My Friends"/>
-		<menu_item_call label="Группы" name="My Groups"/>
-		<menu_item_call label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_check label="Друзья" name="My Friends"/>
+		<menu_item_check label="Группы" name="My Groups"/>
+		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
 		<menu_item_call label="Черный список" name="Block List"/>
 	</menu>
 	<menu label="Мир" name="World">
@@ -113,7 +114,6 @@
 			<menu_item_call label="Купить" name="Menu Object Buy"/>
 			<menu_item_call label="Взять" name="Menu Object Take"/>
 			<menu_item_call label="Взять копию" name="Take Copy"/>
-			<menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
 		</menu>
@@ -128,6 +128,7 @@
 			<menu_item_call label="Наборы связей..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Персонажи..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Просмотр/тестирование..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Восстановить регион" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Параметры" name="Options">
 			<menu_item_check label="Показать расширенные разрешения" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
 	<menu label="Справка" name="Help">
 		<menu_item_call label="Инструкции..." name="How To"/>
 		<menu_item_call label="Справка по [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Руководство пользователя" name="User’s guide"/>
+		<menu_item_call label="База знаний" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Форумы сообщества" name="Community Forums"/>
+		<menu_item_call label="Портал поддержки" name="Support portal"/>
+		<menu_item_call label="Новости [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Жалоба" name="Report Abuse"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
@@ -383,9 +391,14 @@
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Скорость анимации" name="Animation Speed">
+				<menu_item_call label="Ускорить все анимации на 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Замедлить все анимации на 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Восстановить скорость анимаций" name="Reset All Animation Speed"/>
+				<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
-			<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
 			<menu_item_check label="Показать указание" name="Show Point At"/>
 			<menu_item_check label="Отладка обновленных движений суставов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 85b7074253..00ab0b5763 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -516,6 +516,24 @@
 		</url>
 		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=ru-ru
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -1546,10 +1564,13 @@ http://secondlife.com/download.
 		Сейчас невозможно предложить дружбу. Повторите попытку через минуту.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Установлен режим «Занят».
-Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину.
-		<usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Режим «Не беспокоить» включен.  Вы не будете получать уведомлений о входящих вызовах.
+
+- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки &gt; Общие).
+- Предложения телепортации будут отклоняться.
+- Голосовые вызовы будут отклоняться.
+		<usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение.
@@ -2033,6 +2054,10 @@ http://secondlife.com/download.
 		Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта?
 		<usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		При добавлении участника в существующий разговор будет создан новый разговор.  Все участники получат уведомления о новом разговоре.
+		<usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Выйти из программы?
 		<usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/>
@@ -2107,14 +2132,14 @@ http://secondlife.com/download.
 			<button ignore="Не заменять" name="No" text="Отмена"/>
 		</form>
 	</notification>
-	<notification label="Предупреждение о режиме «Занят»" name="BusyModePay">
-		У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж.
+	<notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay">
+		Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж.
 
-Хотите отключить режим «Занят» до завершения этой транзакции?
+Отключить режим «Не беспокоить» перед завершением этой операции?
 		<form name="form">
-			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/>
-			<button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/>
-			<button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/>
+			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/>
+			<button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/>
+			<button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ http://secondlife.com/download.
 	<notification name="GroupNotice">
 		Раздел: [SUBJECT], сообщение: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; в сети
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; не в сети
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Вы лучше всех, но нельзя добавить в друзья себя самого.
@@ -2482,13 +2504,6 @@ http://secondlife.com/download.
 	<notification name="DynamicPathfindingDisabled">
 		В этом регионе не разрешен динамический поиск пути.  Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов.  Чтобы исправить их поведение, нажмите кнопку «Восстановить регион».  Более подробная информация – по ссылке «Справка».
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Справка" ignoretext="Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Произошла ошибка.  Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство.  Иногда для устранения этой проблемы достаточно выйти и снова войти.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2766,7 @@ http://secondlife.com/download.
 	<notification name="ScriptQuestionCaution">
 		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
   
-Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
+Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
 			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
@@ -3333,4 +3348,632 @@ http://secondlife.com/download.
 		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
 		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Аватар заморожен.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] разморозил вас.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Аватар разморожен.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Не удалось заморозить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Заморозка кончилась, занимайтесь своим делом.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Невозможно заморозить этого пользователя.
+	</notification>
+	<notification name="NowOwnObject">
+		Вы стали владельцем объекта [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли.  Узнать, кто владелец, можно с помощью инструмента «Земля».
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Невозможно выложить объект: слишком много запросов.
+	</notification>
+	<notification name="SitFailCantMove">
+		Нельзя сесть: сейчас вы не можете двигаться.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Вам не разрешено садиться на этой земле.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Попробуйте переместиться ближе.  Нельзя сесть на объект:
+он находится в другом регионе.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Невозможно создать новый объект. Регион уже заполнен.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Вы не можете создавать деревья и траву на чужой земле.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Выбран дубликат без корневых объектов.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Невозможно дублировать объекты: регион заполнен.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Невозможно дублировать объекты: не удалось найти их участок.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Нельзя создать объект: 
+участок уже заполнен.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Не удалось выложить объект.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Невозможно создать элемент, который вызвал проблемы в этом регионе.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Этот предмет инвентаря находится в черном списке.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Поиск по земле заблокирован.
+Вы провели слишком много операций поиска за короткое время.
+Повторите попытку через минуту.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Вы умерли и были телепортированы в ваше домашнее местоположение
+	</notification>
+	<notification name="EjectComingSoon">
+		Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Вам нет доступа в этот регион: 
+серпер переполнен.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Сохранение в инвентаре отключено.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]».
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется.
+	</notification>
+	<notification name="NoModNoTaking">
+		Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="RezDestInternalError">
+		Внутренняя ошибка: неизвестный тип места назначения.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Невозможно удалить: объект не найден
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Невозможно выбросить этого пользователя.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="HomePositionSet">
+		Задано положение дома.
+	</notification>
+	<notification name="AvatarEjected">
+		Аватар выброшен.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Не удалось выбросить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		У вас нет прав на изменение этого объекта
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Нельзя включить физику для объекта, который относится к навигационной сетке.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Нельзя включить физику для объектов с ключевыми кадрами.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Нельзя включить физику для объекта -- недостаточно земельных ресурсов.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке.
+	</notification>
+	<notification name="UnableAddItem">
+		Невозможно добавить предмет!
+	</notification>
+	<notification name="UnableEditItem">
+		Редактирование невозможно!
+	</notification>
+	<notification name="NoPermToEdit">
+		Редактирование не разрешено.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Не разрешено копировать этот инвентарь.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Нельзя сохранить в содержимом объекта: предмет уже не существует.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта.
+	</notification>
+	<notification name="TooManyScripts">
+		Слишком много скриптов.
+	</notification>
+	<notification name="UnableAddScript">
+		Невозможно добавить скрипт!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Сервер активов не ответил в заданное время.  Объект возвращен в симулятор.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		В этом регионе не разрешены фигуры с физическими данными.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Нельзя задать свойства физики для объекта этого типа.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Нельзя задать корневой примитив без фигуры.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		В этом регионе не разрешены материалы с физическими данными.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Настройка материалов с физическими данными разрешена только для корневых примитивов.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Присвоение персонажам материалов с физическими данными еще не поддерживается.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Одно или несколько свойств указанного материала с физическими данными недопустимы.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Не разрешается изменять тип стыковки меш-объекта.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Не разрешается изменять форму меш-объекта
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Вам нет доступа в этот регион: \nрегион заполнен.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Связь невозможна -- разные владельцы
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Связь невозможна – нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Связь невозможна: у вас нет разрешения на редактирование.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Связь невозможна -- слишком много примитивов
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Связь невозможна -- нельзя связать некопируемый и непереносимый объекты
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Связь невозможна -- нет связываемых объектов.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Связь невозможна -- слишком много персонажей с поиском пути
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Связь невозможна -- недостаточно земельных ресурсов
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Объект использует слишком много ресурсов физики -- динамическое поведение отключено.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]»
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Вы были телепортированы прикрепленным объектом [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Невозможно создать запрошенный объект. Регион уже заполнен.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Нельзя присоединить несколько объектов к одной точке.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Здесь нельзя создать несколько объектов.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Невозможно создать запрошенный объект. Объекта нет в базе данных.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Невозможно создать запрошенный объект. Повторите попытку.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Не удалось выложить, загрузка нужного объекта длится слишком долго.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Вам нельзя создавать растения на этой земле.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Невозможно восстановить объект. Не найдена позиция в игровом мире.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Невозможно выложить объект: его данные сетки неверны.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Невозможно выложить объект: в этом регионе уже сликом много скриптов.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ваши привилегии доступа не разрешают создание объектов на этом месте.
+	</notification>
+	<notification name="CantCreateObject">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Неверные параметры объекта
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ваши привилегии доступа не разрешают дублирование объектов на этом месте.
+	</notification>
+	<notification name="CantChangeShape">
+		Вам не разрешено изменять эту фигуру.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ваши привилегии доступа не разрешают претендовать на объекты на этом месте.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Не удалось передать: вам не разрешено передавать объекты для этой группы.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ваши привилегии доступа не разрешают покупать объекты на этом месте.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Невозможно присоединить объект: на нем сидит аватар.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Деревья и траву нельзя носить как прикрепленные объекты.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Нельзя присоединять объекты, принадлежащие группе.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Нельзя прикреплять объекты, которыми вы не владеете.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Невозможно присоединить объекты, которые относятся к навигационной сетке.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Нельзя присоединить объект: вам не разрешено его перемещать.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Нельзя сбросить объект здесь.  Участок уже заполнен.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Нельзя коснуться/взять этот объект: вы забанены на этом участке.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Уточните параметры удаления.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Невозможно отправить актив.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Не удалось найти пользователя для телепортации домой
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		режим творца недоступен
+	</notification>
+	<notification name="GenericRequestFailed">
+		не удалось выполнить общий запрос
+	</notification>
+	<notification name="CantUploadPostcard">
+		Невозможно отправить открытку.  Повторите попытку позже.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Невозможно получить данные инвентаря для группового уведомления.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Невозможно отправить групповое уведомление -- не разрешено.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Невозможно отправить групповое уведомление -- не удалось собрать инвентарь.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Невозможно проанализировать инвентарь, указанный в уведомлении.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Не удалось загрузить ландшафт.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Файл ландшафта записан.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Файл ландшафта записан, начинается загрузка...
+	</notification>
+	<notification name="TerrainBaked">
+		Ландшафт готов.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Для покупки этого участка необходимо обновить клиент.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Невозможно купить, этот участок не предназначен для продажи.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Невозможно купить: цена или площадь земли изменились.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Вам не разрешено покупать этот участок.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Здесь нельзя создавать объекты – участок будет переполнен.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Выбрано недостаточно арендуемых участков для вступления.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -&gt; Сообщить об ошибке...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Земля разделена.
+	</notification>
+	<notification name="PassPurchased">
+		Вы приобрели пропуск.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		В регионе не разрешены рекламные объявления.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ваш пропуск на эту землю скоро закончится.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Здесь нет места, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Невозможно претендовать на объект: у вас нет разрешения
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Невозможно претендовать на объект: у вас не хватает L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Нельзя передать землю, принадлежащую группе.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Не удалось купить объект: у вас не хватает L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Не удалось купить инвентарь: у вас не хватает L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		У вас недостаточно L$, чтобы заплатить за проход на эту землю.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Сейчас нельзя купить пропуск.  Повторите попытку позже.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Невозможно создать объект:\nучасток заполнен.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Невозможно создать закладку для события.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Сила творца одолевает заморозку!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Не удалось выполнить запрос на особые способности. Запрос зарегистрирован.
+	</notification>
+	<notification name="ExpireExplanation">
+		Система сейчас не может обработать ваш запрос. Истекло время запроса.
+	</notification>
+	<notification name="DieExplanation">
+		Система не может обработать ваш запрос.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Недостаточно денег для создания примитива.
+	</notification>
+	<notification name="RezObjectFailure">
+		Недостаточно денег для создания объекта.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Недопустимое домашнее местоположение; восстановлено стандартное местоположение.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="SetHomePosition">
+		Домашнее местоположение задано.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Невозможно забрать объект: сбой инвентаря.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Невозможно создать требуемый инвентарь.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Невозможно создать требуемую папку инвентаря.
+	</notification>
+	<notification name="CantCreateInventory">
+		Невозможно создать этот инвентарь.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Невозможно создать закладку.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Сейчас нельзя создать костюм. Попробуйте через минуту.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Инвентарь не для продажи.
+	</notification>
+	<notification name="CantFindInvItem">
+		Не удалось найти предмет из инвентаря.
+	</notification>
+	<notification name="CantFindObject">
+		Не удалось найти объект.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Сейчас в этом регионе запрещен перевод денег на объекты.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Непонятно, кому платить.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Нельзя отдавать L$ за общедоступные объекты.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Не удалось создать инвентарь в объекте игрового мира.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Не удалось обновить клиент из-за внутренней ошибки.  Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Нельзя создавать большие примитивы, которые пересекаются с другими игроками.  Повторите попытку, когда другие игроки уйдут.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов.
+		<usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены.
+		<usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Невозможно переместить файлы. Восстановлен прежний путь.
+		<usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
index 75e396222f..4866bb7ed6 100644
--- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/>
 	<icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/>
 	<icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
index 214ca8bf3a..70a1b25996 100644
--- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Черный список
-	</text>
-	<scroll_list name="blocked" tool_tip="Список заблокированных жителей"/>
-	<button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/>
-	<button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/>
-	<button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Фильтр" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/>
+		<menu_button name="view_btn" tool_tip="Параметры сортировки"/>
+		<menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/>
+		<button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Список заблокированных жителей"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..4fdb4f9122
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(загрузка)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..98fe7b99be
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Включая голосовой чат"/>
+	<icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/>
+	<button name="delete_btn" tool_tip="Удалить эту запись"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index 7f000fb5a0..b043ffbbe2 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 607921f2d6..7da7fb3191 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском].
 	</string>
-	<string name="people_filter_label" value="Фильтр для людей"/>
-	<string name="groups_filter_label" value="Фильтр для групп"/>
 	<string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/>
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
-	<filter_editor label="Фильтр" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
-		<panel label="МОИ ДРУЗЬЯ" name="friends_panel">
+		<panel label="ДРУЗЬЯ" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Предложить жителю дружбу"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="МОИ ГРУППЫ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Опции"/>
-				<button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
-				<button name="activate_btn" tool_tip="Активировать выбранную группу"/>
+		<panel label="ГРУППЫ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Фильтр для групп" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/>
+				<menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
+				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
 			</panel>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
+		<panel label="БЛОКИРОВАН" name="blocked_panel">
+			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 9283fc9e6e..6383fc8c2c 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<text name="font_size">
-		Размер шрифта:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Мелкий" name="radio" value="0"/>
-		<radio_item label="Средний" name="radio2" value="1"/>
-		<radio_item label="Крупный" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
-	<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
-	<check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/>
-	<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Показывать сообщения:
-	</text>
-	<text name="requires_restart_label">
-		(требуется перезапуск)
-	</text>
-	<radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)">
-		<radio_item label="В отдельных окнах" name="radio" value="0"/>
-		<radio_item label="На вкладках" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Включить всплывающие сообщения с новыми репликами в чате:
-	</text>
-	<check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/>
-	<check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/>
-	<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
-	<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
+		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Размер шрифта:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Мелкий" name="Small" value="0"/>
+			<item label="Средний" name="Medium" value="1"/>
+			<item label="Крупный" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Уведомления
+		</text>
+		<text name="friend_ims">
+			IM друзей:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM чужих:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM конференции:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="group_chat">
+			Групповой чат:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Локальный чат:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Звук:
+		</text>
+		<check_box label="Новый разговор" name="new_conversation"/>
+		<check_box label="Входящий голосовой вызов" name="incoming_voice_call"/>
+		<check_box label="Предложение телепортации" name="teleport_offer"/>
+		<check_box label="Предложение инвентаря" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Очистить журнал..." name="clear_log"/>
+		<button label="Удалить записи..." name="delete_transcripts"/>
+		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
+	</panel>
 	<button label="Перевод..." name="ok_btn"/>
 	<button label="Автозамена..." name="autoreplace_showgui"/>
 	<button label="Проверка правописания..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index d1bfedf2d8..c7a850f78a 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Ответ в режиме «Занят»:
+		Ответ в режиме «Не беспокоить»:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index e9dd3760b5..5502530ca4 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Купить объект" name="Buyobject"/>
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
+			<combo_box.item label="Приблизить" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index f9ded799bf..d7d4df4a37 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ru-RU&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
@@ -619,7 +619,7 @@ support@secondlife.com.
 	<string name="AvatarAway">
 		Нет на месте
 	</string>
-	<string name="AvatarBusy">
+	<string name="AvatarDoNotDisturb">
 		Не беспокоить
 	</string>
 	<string name="AvatarMuted">
@@ -856,6 +856,12 @@ support@secondlife.com.
 	<string name="ST_NO_JOINT">
 		Не удается найти объект ROOT или JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Локальный чат
+	</string>
+	<string name="NearbyChatLabel">
+		(Локальный чат)
+	</string>
 	<string name="whisper">
 		шепчет:
 	</string>
@@ -919,12 +925,15 @@ support@secondlife.com.
 	<string name="ControlYourCamera">
 		Управлять камерой
 	</string>
-	<string name="TeleportYourAgent">
-		Телепортировать вас
-	</string>
 	<string name="NotConnected">
 		Нет подключения
 	</string>
+	<string name="AgentNameSubst">
+		(Вы)
+	</string>
+	<string name="TeleportYourAgent">
+		Телепортировать вас
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -1006,18 +1015,6 @@ support@secondlife.com.
 	<string name="dictionary_files">
 		Словари
 	</string>
-	<string name="AvatarSetNotAway">
-		На месте
-	</string>
-	<string name="AvatarSetAway">
-		Нет на месте
-	</string>
-	<string name="AvatarSetNotBusy">
-		Не занят(а)
-	</string>
-	<string name="AvatarSetBusy">
-		Не беспокоить
-	</string>
 	<string name="shape">
 		Фигура
 	</string>
@@ -1986,8 +1983,8 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		Новый скрипт
 	</string>
-	<string name="BusyModeResponseDefault">
-		У адресата вашего сообщения задан статус «Не беспокоить».  Ваше сообщение все равно будет отображено на панели IM для просмотра позже.
+	<string name="DoNotDisturbModeResponseDefault">
+		Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже.
 	</string>
 	<string name="MuteByName">
 		(по имени)
@@ -2100,9 +2097,6 @@ support@secondlife.com.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Контент
-	</string>
 	<string name="AcquiredItems">
 		Купленные вещи
 	</string>
@@ -3871,7 +3865,7 @@ support@secondlife.com.
 		Область общей дозволенности
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Все жители с других участков могут видеть аватары и общаться в чате
+		Аватары на этом участке невидимы и неслышимы для аватаров с других участков
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
@@ -3948,6 +3942,12 @@ support@secondlife.com.
 	<string name="IM_unblock_only_groups_friends">
 		Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность».
 	</string>
+	<string name="OnlineStatus">
+		Онлайн
+	</string>
+	<string name="OfflineStatus">
+		Оффлайн
+	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
 	</string>
@@ -3957,6 +3957,9 @@ support@secondlife.com.
 	<string name="you_joined_call">
 		Вы присоединились к голосовой беседе
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить».
+	</string>
 	<string name="name_started_call">
 		Житель [NAME] начал голосовую беседу
 	</string>
@@ -3973,7 +3976,7 @@ support@secondlife.com.
 		Соединяется...
 	</string>
 	<string name="conference-title">
-		Спонтанная конференция
+		Чат с несколькими участниками
 	</string>
 	<string name="conference-title-incoming">
 		Конференция с жителем [AGENT_NAME]
@@ -4865,6 +4868,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Label">
 		Чат
 	</string>
+	<string name="Command_Conversations_Label">
+		Разговоры
+	</string>
 	<string name="Command_Compass_Label">
 		Компас
 	</string>
@@ -4940,6 +4946,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Tooltip">
 		Обменивайтесь текстовыми репликами с людьми вокруг вас
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Поговорить со всеми
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Компас
 	</string>
@@ -5069,4 +5078,13 @@ support@secondlife.com.
 	<string name="UserDictionary">
 		[Пользователь]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
new file mode 100644
index 0000000000..5f8dac506f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ">
+	<panel name="buttons_panel">
+		<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..84403dfd68
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="KONUŞMA:">
+	<floater.string name="Title">
+		KONUŞMA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Sayfa"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
index 4451d1d309..6504430b3c 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="SOHBETLER"/>
+<multi_floater name="floater_im_box" title="SOHBETLER">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+					<button name="add_btn" tool_tip="Yeni bir sohbet başlat"/>
+					<button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/>
+					<text name="stub_textbox">
+						Sohbet ayrı bir pencerede.   [secondlife:/// Bunu geri getir.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index bed08b36c6..8ce8f0fe13 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Kime" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/>
+	<floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/>
+	<floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/>
+	<floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<button name="add_btn" tool_tip="Bu sohbete birini ekle"/>
+				<button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/>
+				<button name="close_btn" tool_tip="Bu sohbeti bitir"/>
+				<button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Kime" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
index adb03c2dff..0f2b27241e 100644
--- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonim
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		arıyor.
+		sizi arıyor.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		bir Sesli Sohbet aramasına bir konferans araması ile katıldı.
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
+		Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek.
 	</text>
-	<button label="Kabul Et" label_selected="Kabul Et" name="Accept"/>
-	<button label="Reddet" label_selected="Reddet" name="Reject"/>
-	<button label="Aİ Başlat" name="Start IM"/>
+	<button label="Yanıtla" label_selected="Yanıtla" name="Accept"/>
+	<button label="Yok say" label_selected="Yok say" name="Reject"/>
+	<button label="Bunun yerine Aİ aç" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 6eecc7fb77..35f47e6dfa 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Göster:
 			</text>
-			<check_box label="Dünya" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
 			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 889425f23a..42483c09e1 100644
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
 	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
-	<check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Önizleme Devre Dışı"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..ec350bee60
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ">
+	<slider label="Sesli Sohbet" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
index 3534a3fe90..7a157244cd 100644
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME">
+<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
 	<string name="no_voice_effect">
 		(Ses Şekillendirme Yok)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
new file mode 100644
index 0000000000..acf99d6199
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="SES DÜZEYİ">
+	<slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
index f910e1fe91..9480d30029 100644
--- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/>
-	<menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
new file mode 100644
index 0000000000..31404f2501
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
+	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
+	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Arkadaş ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Arkadaşları çıkar" name="remove_friends"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Sesi Engelle" name="block_unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+	<menu_item_call label="Grup Profili" name="group_profile"/>
+	<menu_item_call label="Grubu Etkinleştir" name="activate_group"/>
+	<menu_item_call label="Gruptan Ayrıl" name="leave_group"/>
+	<context_menu label="Moderatör Seçenekleri" name="Moderator Options">
+		<menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/>
+		<menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/>
+		<menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..9e91780eb8
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="Aİ..." name="IM"/>
+	<menu_item_call label="Sesli arama..." name="Call"/>
+	<menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/>
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="Invite"/>
+	<menu_item_call label="Harita" name="Map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..9a77eaadd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Tarihe göre sırala" name="sort_by_date"/>
+	<menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/>
+	<menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
new file mode 100644
index 0000000000..3b9738edce
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Sesi Engelle" name="Block/Unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..c4d4357ac9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Daraltılmış görünüm" name="compact_view"/>
+	<menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/>
+	<menu_item_check label="Zamanı göster" name="IMShowTime"/>
+	<menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 34a2661d8a..3d5c68d9d3 100644
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Nesne Profili..." name="Object Profile"/>
 	<menu_item_call label="Engelle..." name="Block"/>
+	<menu_item_call label="Haritada Göster" name="show_on_map"/>
+	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index d2e7e7107a..674041e9c9 100644
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Yeni Saç" name="New Hair"/>
 		<menu_item_call label="Yeni Gözler" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Tüm klasörleri genişlet" name="expand"/>
+	<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
 	<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
 	<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
new file mode 100644
index 0000000000..e9411ff350
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/>
+	<menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/>
+	<menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/>
+	<menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/>
+	<menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/>
+	<menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/>
+	<menu_item_check label="Sohbet günlüğü..." name="Conversation"/>
+	<menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/>
+	<menu_item_check label="Çeviri ayarları..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..2bf1101b48
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a869e2ae7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/>
+	<menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..14b3de3a9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Türe göre sırala" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..609584d6a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
+	<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
index 9f2946e310..743b01844d 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Bilgileri Görüntüle" name="View Info"/>
 	<menu_item_call label="Sohbet" name="Chat"/>
-	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Sesli arama" name="Call"/>
 	<menu_item_call label="Etkinleştir" name="Activate"/>
 	<menu_item_call label="Ayrıl" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..e550b20add
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index ee859a9450..2d61461c91 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Harita" name="Map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
index 5c89f87906..20695d98e8 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Arkadaş Ekle" name="Add Friends"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friends"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Ara" name="call"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..59ea7c145f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Haritayı Göster" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..02be715ed2
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index d82b52aea8..b14a0509bf 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Sakin Profilini Göster" name="show_agent"/>
+	<menu_item_call label="Profili Göster" name="show_agent"/>
+	<menu_item_call label="Aİ Gönder..." name="send_im"/>
+	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index d55e34c11c..00fa3c27c2 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/>
+	<menu_item_call label="Nesne Profili..." name="show_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 7a7faf6ac4..c465966fc7 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Durum" name="Status">
-			<menu_item_call label="Uzakta" name="Set Away"/>
-			<menu_item_call label="Meşgul" name="Set Busy"/>
-		</menu>
+		<menu label="Durum" name="Status"/>
 		<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="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
-		<menu_item_check label="Sohbet..." name="Nearby Chat"/>
+		<menu_item_check label="Sohbetler..." name="Conversations"/>
+		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
-		<menu_item_check label="Ses ayarları..." name="Nearby Voice"/>
-		<menu_item_check label="Ses şekillendirme..." name="ShowVoice"/>
+		<menu label="Ses şekillendirme" name="VoiceMorphing">
+			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
+			<menu_item_check label="Önizleme..." name="Preview"/>
+			<menu_item_call label="Abone ol..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
-		<menu_item_call label="Arkadaşlar" name="My Friends"/>
-		<menu_item_call label="Gruplar" name="My Groups"/>
-		<menu_item_call label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_check label="Arkadaşlar" name="My Friends"/>
+		<menu_item_check label="Gruplar" name="My Groups"/>
+		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
 		<menu_item_call label="Engelleme Listesi" name="Block List"/>
 	</menu>
 	<menu label="Dünya" name="World">
@@ -113,7 +114,6 @@
 			<menu_item_call label="Satın Al" name="Menu Object Buy"/>
 			<menu_item_call label="Al" name="Menu Object Take"/>
 			<menu_item_call label="Kopya Al" name="Take Copy"/>
-			<menu_item_call label="Envanterime Geri Kaydet" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Nesne İçeriklerine Geri Kaydet" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Nesneyi İade Et" name="Return Object back to Owner"/>
 		</menu>
@@ -128,6 +128,7 @@
 			<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Karakterler..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Görüntüleme / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Bölgeyi tekrar kaydet" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Seçenklr." name="Options">
 			<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
 	<menu label="Yardım" name="Help">
 		<menu_item_call label="Nasıl yapılır..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/>
+		<menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/>
+		<menu_item_call label="Bilgi Bankası" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Topluluk Forumları" name="Community Forums"/>
+		<menu_item_call label="Destek portalı" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] Haberleri" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/>
 		<menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/>
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
@@ -383,9 +391,14 @@
 				<menu_item_call label="Test Dişisi" name="Test Female"/>
 				<menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Animasyon Hızı" name="Animation Speed">
+				<menu_item_call label="Tüm Animasyonlar %10 Daha Hızlı" name="All Animations 10 Faster"/>
+				<menu_item_call label="Tüm Animasyonlar %10 Daha Yavaş" name="All Animations 10 Slower"/>
+				<menu_item_call label="Tüm Animasyon Hızlarını Sıfırla" name="Reset All Animation Speed"/>
+				<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/>
 			<menu_item_check label="Animasyon Bilgisi" name="Animation Info"/>
-			<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
 			<menu_item_check label="Şuraya Bak&apos;ı Göster" name="Show Look At"/>
 			<menu_item_check label="Şuraya İşaret Et&apos;i Göster" name="Show Point At"/>
 			<menu_item_check label="Eklem Güncelleştirmeleri İçin Hata Ayıklama" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 488702f9ca..ad92a4b478 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -516,6 +516,24 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -1546,10 +1564,13 @@ Gruptan ayrılmak istiyor musunuz?
 		Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Durumunuz Meşgul olarak ayarlandı.
-Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek.
-		<usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/>
+	<notification name="DoNotDisturbModeSet">
+		Rahatsız Etme açık.  Gelen iletişimlerle ilgili size bilgi verilmeyecek.
+
+- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler &gt; Genel içerisinde ayarlanır).
+- Işınlanma teklifleri reddedilecektir.
+- Sesli aramalar reddedilecektir.
+		<usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin.
@@ -2033,6 +2054,10 @@ Envanter öğesi/öğeleri taşınsın mı?
 		Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz?
 		<usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur.  Tüm katılımcılara yeni sohbet bildirimi gönderilir.
+		<usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/>
@@ -2107,14 +2132,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
 			<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
 		</form>
 	</notification>
-	<notification label="Meşgul Durumu Uyarısı" name="BusyModePay">
-		Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir.
+	<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
+		Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
 
-Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz?
+Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
 		<form name="form">
-			<ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/>
-			<button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/>
-			<button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/>
+			<ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/>
+			<button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/>
+			<button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 	<notification name="GroupNotice">
 		Konu: [SUBJECT], İleti: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimiçi
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimdışı
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; durumu: [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz.
@@ -2482,13 +2504,6 @@ Burada uçamazsınız.
 	<notification name="DynamicPathfindingDisabled">
 		Bu bölgede dinamik yol bulma etkin değil.  Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir.  Hareket eden başka nesnelerin doğru davranmasını sağlamak için “Bölgeyi yeniden kaydet” düğmesine tıklayın.  Daha fazla bilgi edinmek için “Yardım” seçimini yapın.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Yardım" ignoretext="Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir." name="okhelpignore" yestext="Tamam"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Bir hata meydana geldi.  Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz.  Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer.
 		<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2751,7 +2766,7 @@ Kabul ediyor musunuz?
 	<notification name="ScriptQuestionCaution">
 		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
   
-Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
+Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
 			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
@@ -3333,4 +3348,626 @@ Girişim iptal edildi.
 		[NUM_ITEMS] öğeyi siliyorsunuz.  Devam etmek istediğinize emin misiniz?
 		<usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar donduruldu.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] sizin dondurulmanızı kaldırdı.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar artık dondurulmuş değil.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Üzgünüz, bu kullanıcı dondurulamaz.
+	</notification>
+	<notification name="NowOwnObject">
+		Artık [OBJECT_NAME] nesnesinin sahibisiniz
+	</notification>
+	<notification name="CantRezOnLand">
+		[OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor.  Arazinin sahibini görmek için arazi aracını kullanın.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Çok fazla talep olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="SitFailCantMove">
+		Oturamazsınız çünkü şu anda hareket edemezsiniz.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Oturamazsınız çünkü bu araziye girme izniniz yok.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Daha yakına gelmeyi deneyin.  Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Yeni nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesi size aktarılamadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi navmesh&apos;e katkıda bulunduğu için kopyalama başarılamadı.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Kök nesne seçili olmayan kopya.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Nesneler çoğaltılamıyor çünkü bölge dolu.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Nesne oluşturulamıyor çünkü
+parsel dolu.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Bir nesneyi oluşturma girişimi başarısız oldu.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Bu envanter öğesi kara listeye alınmış.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Arazi Arama Engellendi.
+Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz.
+Lütfen bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız
+	</notification>
+	<notification name="EjectComingSoon">
+		Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Bu bölgeye giremezsiniz çünkü 
+sunucu dolu.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Envantere Geri Kaydet devre dışı bırakıldı.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		&apos;[DEST_NAME]&apos; nesnesini değiştirme izniniz olmadığı için &apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		&apos;[OBJ_NAME]&apos; envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoTransNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Benzeticiden &apos;[OBJ_NAME]&apos; nesnesinin kaldırılmasına izinler sistemi izin vermiyor.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoModNoTaking">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız.
+	</notification>
+	<notification name="RezDestInternalError">
+		Dahili Hata: Bilinmeyen hedef türü.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Nesne bulunamadığı için silme başarılamadı
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Üzgünüz, bu kullanıcı çıkartılamaz.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="HomeLocationLimits">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="HomePositionSet">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar çıkartıldı.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh&apos;i bölge sınırları ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Bu nesneyi değiştirme izniniz yok
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Navmesh&apos;e katkıda bulunan bir nesne için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Anahtar karelenmiş nesneler için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Fizik kaynağı maliyeti [MAX_OBJECTS]&apos;dan büyük nesne için fizik etkinleştirilemedi
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Bu nesne fantom olduğu ve navmesh&apos;e katkıda bulunduğu için konkav bir parçaya sahip olamaz.
+	</notification>
+	<notification name="UnableAddItem">
+		Öğe eklenemedi!
+	</notification>
+	<notification name="UnableEditItem">
+		Bu düzenlenemiyor!
+	</notification>
+	<notification name="NoPermToEdit">
+		Bunu düzenleme izni yok.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Bu envanteri kopyalama izni yok.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
+	</notification>
+	<notification name="TooManyScripts">
+		Çok fazla komut dosyası.
+	</notification>
+	<notification name="UnableAddScript">
+		Komut dosyası eklenemedi!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Varlık sunucusu zamanında yanıt vermedi.  Nesne sime iade edildi.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Bu bölgede fiziksel şekiller etkin değil.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Bu nesne türü üzerinde fizik özellikleri ayarlanamaz.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Kök prim şekilsiz olacak şekilde ayarlanamaz.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Bu bölgede fiziksel malzemeler etkin değil.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Sadece kök primlerin fizik malzemeleri ayarlanabilir.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Bir örgü nesnesinin dikiş türünü değiştiremezsiniz.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Bir örgü nesnesinin şeklini değiştiremezsiniz
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Bu bölgeye giremezsiniz çünkü \nbölge dolu.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Bağlantı başarısız oldu -- sahipler farklı
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Bağlntı başarılamadı -- navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Bağlantı başarısız oldu -- çok fazla ilkel öğe var
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Bağlantı başarısız oldu -- arazi kaynakları yetersiz
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		&apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedByAttachment">
+		You have been teleported by an attachment on [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Bilinmeyen bir sahibi olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Talep edilen nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Tek bir noktaya birden fazla nesne iliştiremezsiniz.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Burada birden fazla nesne oluşturamazsınız.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Bu arazide bitkiler oluşturamazsınız.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Nesne geri yüklenemiyor. Dünya konumu bulunamadı.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Örgü verileri geçersiz olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor.
+	</notification>
+	<notification name="CantCreateObject">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Geçersiz nesne parametreleri
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor.
+	</notification>
+	<notification name="CantChangeShape">
+		Bu şekli değiştirmenize izin verilmiyor.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Üzerinde bir avatar oturduğu için nesne iliştirilemiyor.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Ağaçlar ve çimen aksesuar olarak giyilemez.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Sahibi grup olan nesneler iliştirilemiyor.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Sahip olmadığınız nesneleri iliştiremezsiniz.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Navmesh&apos;e katkıda bulunan nesneler iliştirilemez.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Aksesuar düşürülemedi: Burada düşürme izniniz yok.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Nesne buraya düşürülemez.  Parsel dolu.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Lütfen silme parametrelerinizi daraltın.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Varlık karşıya yüklenemiyor.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Ana konuma ışınlanacak kullanıcı bulunamadı
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		tanrısal talep başarısız oldu
+	</notification>
+	<notification name="GenericRequestFailed">
+		genel talep başarısız oldu
+	</notification>
+	<notification name="CantUploadPostcard">
+		Posta kartı karşıya yüklenemiyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Grup bildirimi için envanter ayrıntıları alınamadı.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Grup bildirimi gönderilemedi -- izin verilmiyor.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Grup bildirimi gönderilemedi -- envanter oluşturulamadı.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Bildirimde envanter ayrıştırılamadı.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Yüzeyin karşıya yüklemesi başarılamadı.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Yüzey dosyası yazıldı.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor...
+	</notification>
+	<notification name="TerrainBaked">
+		Yüzey kaydedildi.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Satın alınamıyor, bu parsel satılık değil.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Bu parsel için yetkili alıcı değilsiniz.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -&gt; Hata Bildir ile bildirin...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Arazi bölündü.
+	</notification>
+	<notification name="PassPurchased">
+		Bir geçiş hakkı satın aldınız.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Bölgede seri ilanlara izin verilmiyor.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Bu arazi için geçiş hakkınız sona ermek üzere.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Burada oturacak yer yok, başka bir yer deneyin.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Grubun sahip olduğu araziyi devredemezsiniz.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Şu anda geçiş hakkı satın alınamıyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Nesne oluşturulamıyor çünkü \nparsel dolu.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Etkinlik için yer imi oluşturulamıyor.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Tanrısal güçleriniz dondurmayı devre dışı bıraktı!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi.
+	</notification>
+	<notification name="ExpireExplanation">
+		Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı.
+	</notification>
+	<notification name="DieExplanation">
+		Sistem talebinizi işleyemiyor.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		İlkel öğeyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="RezObjectFailure">
+		Nesneyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Ana konum sıfırlandı çünkü Ana konum yasal değildi.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="SetHomePosition">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Envanter hatasından ötürü nesne oluşturulması geri alınamıyor.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Talep edilen envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Talep edilen envanter klasörü oluşturulamadı.
+	</notification>
+	<notification name="CantCreateInventory">
+		Bu envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Yer imi oluşturulamıyor.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Envanter satılık değil.
+	</notification>
+	<notification name="CantFindInvItem">
+		Envanter öğesi bulunamıyor.
+	</notification>
+	<notification name="CantFindObject">
+		Nesne bulunamıyor.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Kime ödeme yapılacağı belirlenemedi.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Kamusal nesnelere L$ veremezsiniz.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Dünya içerisindeki nesnede envater oluşturma başarısız oldu.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik.  Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Başka oyuncularla kesişen büyük primler oluşturulamaz.  Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir.
+		<usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir.
+		<usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dosyalar taşınamıyor. Önceki yol geri yüklendi.
+		<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
index 7542778aca..f330bd85e8 100644
--- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/>
 	<icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/>
 	<icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
index 0464b7ec07..87b67e249e 100644
--- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Listeyi Engelle
-	</text>
-	<scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
-	<button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/>
-	<button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/>
-	<button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrele" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/>
+		<menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/>
+		<menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/>
+		<button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..c7227f02b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(yükleniyor)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..79895f9c21
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/>
+	<icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/>
+	<button name="delete_btn" tool_tip="Bu girişi kaldır"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
index 2bc597f2fa..f44d2b5e76 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Bilinmiyor"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 1a1e53bac2..08efd0aa61 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -14,81 +14,53 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_filtered_friends_msg">
 		Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin.
 	</string>
-	<string name="people_filter_label" value="Kişileri Filtrele"/>
-	<string name="groups_filter_label" value="Grupları Filtrele"/>
 	<string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/>
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
-	<filter_editor label="Filtrele" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
-		<panel label="ARKADAŞLARIM" name="friends_panel">
+		<panel label="ARKADAŞLAR" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="GRUPLARIM" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
-				<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
+		<panel label="GRUPLAR" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Grupları Filtrele" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/>
+				<menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
+				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
 			</panel>
 		</panel>
 		<panel label="SON" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
+		<panel label="ENGELLENMİŞ" name="blocked_panel">
+			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index 231e8fc5fe..aaeebdfe6e 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<text name="font_size">
-		Font büyüklüğü:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Küçük" name="radio" value="0"/>
-		<radio_item label="Orta" name="radio2" value="1"/>
-		<radio_item label="Büyük" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
-	<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
-	<check_box label="Düz metin Aİ&apos;ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/>
-	<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Aİ&apos;leri şurada göster:
-	</text>
-	<text name="requires_restart_label">
-		(tekrar başlatma gerekir)
-	</text>
-	<radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
-		<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
-		<radio_item label="Sekmeler" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Gelen sohbet için açılır pencereleri etkinleştir:
-	</text>
-	<check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/>
-	<check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/>
-	<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
-	<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
+		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
+		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Font büyüklüğü:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Küçük" name="Small" value="0"/>
+			<item label="Orta" name="Medium" value="1"/>
+			<item label="Büyük" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Bildirimler
+		</text>
+		<text name="friend_ims">
+			Arkadaş Aİ&apos;leri:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			Arkadaş harici Aİ&apos;ler:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			Konferans Aİ&apos;leri:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Grup sohbeti:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Yakındaki sohbet:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Sesi çal:
+		</text>
+		<check_box label="Yeni sohbet" name="new_conversation"/>
+		<check_box label="Gelen sesli arama" name="incoming_voice_call"/>
+		<check_box label="Işınlama teklifi" name="teleport_offer"/>
+		<check_box label="Envanter teklifi" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Günlüğü temizle..." name="clear_log"/>
+		<button label="Dökümleri sil..." name="delete_transcripts"/>
+		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
+	</panel>
 	<button label="Çeviri..." name="ok_btn"/>
 	<button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/>
 	<button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index 4a48b1588c..1a13cf8f71 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="asla" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Meşgul durumu cevabı:
+		Rahatsız Etme yanıtı:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index b0b9ab7716..9a4cf54fa7 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Nesneyi satın al" name="Buyobject"/>
 			<combo_box.item label="Nesneye ödeme yap" name="Payobject"/>
 			<combo_box.item label="Aç" name="Open"/>
+			<combo_box.item label="Yakınlaştır" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 1be8f5974c..155dc8749a 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=tr-TR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
@@ -619,8 +619,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AvatarAway">
 		Uzakta
 	</string>
-	<string name="AvatarBusy">
-		Meşgul
+	<string name="AvatarDoNotDisturb">
+		Rahatsız Etme
 	</string>
 	<string name="AvatarMuted">
 		Engellenmiş
@@ -856,6 +856,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ST_NO_JOINT">
 		KÖK veya EKLEM bulunamıyor.
 	</string>
+	<string name="NearbyChatTitle">
+		Yakındaki sohbet
+	</string>
+	<string name="NearbyChatLabel">
+		(Yakındaki sohbet)
+	</string>
 	<string name="whisper">
 		fısıldar:
 	</string>
@@ -919,12 +925,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ControlYourCamera">
 		Kameranızı kontrol etmek
 	</string>
-	<string name="TeleportYourAgent">
-		Sizi ışınlama
-	</string>
 	<string name="NotConnected">
 		Bağlı Değil
 	</string>
+	<string name="AgentNameSubst">
+		(Siz)
+	</string>
+	<string name="TeleportYourAgent">
+		Sizi ışınlama
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -1006,18 +1015,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="dictionary_files">
 		Sözlükler
 	</string>
-	<string name="AvatarSetNotAway">
-		Uzakta Değil
-	</string>
-	<string name="AvatarSetAway">
-		Uzakta
-	</string>
-	<string name="AvatarSetNotBusy">
-		Meşgul Değil
-	</string>
-	<string name="AvatarSetBusy">
-		Meşgul
-	</string>
 	<string name="shape">
 		Şekil
 	</string>
@@ -1986,8 +1983,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="PanelContentsNewScript">
 		Yeni Komut Dosyası
 	</string>
-	<string name="BusyModeResponseDefault">
-		İleti gönderdiğiniz Sakin &apos;meşgul modu&apos;nda, bu da rahatsız edilmek istemediği anlamına geliyor.  İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir.
+	<string name="DoNotDisturbModeResponseDefault">
+		Bu sakin &quot;Rahatsız Etme&quot; seçeneğini devreye almış, mesajınızı sonra görecek.
 	</string>
 	<string name="MuteByName">
 		(Adına göre)
@@ -2100,9 +2097,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		İçerik
-	</string>
 	<string name="AcquiredItems">
 		Alınan Öğeler
 	</string>
@@ -3874,7 +3868,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Genel Bölge
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor
+		Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir.
@@ -3951,6 +3945,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="IM_unblock_only_groups_friends">
 		Bu mesajı görmek için Tercihler/Gizlilik&apos;de &apos;Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin&apos; seçeneğinin işaretini kaldırmalısınız.
 	</string>
+	<string name="OnlineStatus">
+		Çevrimiçi
+	</string>
+	<string name="OfflineStatus">
+		Çevrimdışı
+	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
@@ -3960,6 +3960,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="you_joined_call">
 		Sesli aramaya katıldınız
 	</string>
+	<string name="you_auto_rejected_call-im">
+		&quot;Rahatsız Etme&quot; seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz.
+	</string>
 	<string name="name_started_call">
 		[NAME] bir sesli arama başlattı
 	</string>
@@ -3976,7 +3979,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Bağlanıyor...
 	</string>
 	<string name="conference-title">
-		Özel Konferans
+		Çok kişili sohbet
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] ile konferans
@@ -4866,6 +4869,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Label">
 		Sohbet
 	</string>
+	<string name="Command_Conversations_Label">
+		Sohbetler
+	</string>
 	<string name="Command_Compass_Label">
 		Pusula
 	</string>
@@ -4941,6 +4947,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Tooltip">
 		Metin kullanarak yakındaki kişilerle sohbet etmek
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Herkesle sohbet et
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Pusula
 	</string>
@@ -5070,4 +5079,13 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
new file mode 100644
index 0000000000..37115a0310
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="交談記錄">
+	<panel name="buttons_panel">
+		<filter_editor label="人員過濾器" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
+		<menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ece263f440
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="交談：">
+	<floater.string name="Title">
+		交談：[NAME]
+	</floater.string>
+	<text name="page_label" value="頁"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 2d66c659fe..84ad869100 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談"/>
+<multi_floater name="floater_im_box" title="交談">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
+					<button name="add_btn" tool_tip="開始新的交談"/>
+					<button name="speak_btn" tool_tip="用麥克風和大家交談"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
+					<text name="stub_textbox">
+						這個交談另開了新視窗。   [secondlife:/// 把它收回來]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index 808a0b6720..d63c5507db 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="至" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
+	<floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
+	<floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
+	<floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<button name="add_btn" tool_tip="新增某人到這個交談"/>
+				<button name="voice_call_btn" tool_tip="建立語音通聯"/>
+				<button name="close_btn" tool_tip="結束這個交談"/>
+				<button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="至" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 45a003d3c8..4526eff21d 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
+		如果接聽，你將切斷目前的語音交談。
 	</text>
-	<button label="接受" label_selected="接受" name="Accept"/>
-	<button label="拒絕" label_selected="拒絕" name="Reject"/>
-	<button label="開始 IM" name="Start IM"/>
+	<button label="接聽" label_selected="接聽" name="Accept"/>
+	<button label="忽視" label_selected="忽視" name="Reject"/>
+	<button label="不接聽但開啟 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index be009b54d8..d0978b8b01 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				顯示：
 			</text>
-			<check_box label="世界" name="show_world"/>
+			<check_box label="測試" name="show_world"/>
 			<check_box label="僅限可移動的" name="show_world_movables_only"/>
 			<check_box label="導航網面" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index e909a67e2c..02d06323d4 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="預設" label_selected="預設" name="Default"/>
 	<button label="空白" label_selected="空白" name="Blank"/>
 	<button label="無" label_selected="無" name="None"/>
-	<check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="已停用預覽"/>
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..96caa7d333
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="語音聊天音量">
+	<slider label="語音聊天" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index 81e0204262..aab5fa6028 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲">
+<floater label="地點" name="voice_effects" title="語音變聲試聽">
 	<string name="no_voice_effect">
 		（無變聲效果）
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
new file mode 100644
index 0000000000..4260a8d331
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="音量">
+	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index cd069f9601..eb7093a23c 100644
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
-	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
+	<menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
new file mode 100644
index 0000000000..507255d0c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="關閉交談" name="close_conversation"/>
+	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
+	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="新增朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="禁止語音" name="block_unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+	<menu_item_call label="群組檔案" name="group_profile"/>
+	<menu_item_call label="啟用群組" name="activate_group"/>
+	<menu_item_call label="離開群組" name="leave_group"/>
+	<context_menu label="主持人選項" name="Moderator Options">
+		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
+		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
+		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..49e91417e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM…" name="IM"/>
+	<menu_item_call label="語音通話…" name="Call"/>
+	<menu_item_call label="開啟聊天歷史…" name="Chat history"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="Invite"/>
+	<menu_item_call label="地圖" name="Map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..3fa99a5cd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依日期排序" name="sort_by_date"/>
+	<menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
+	<menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
new file mode 100644
index 0000000000..815b0b594c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="加為朋友" name="Add Friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="禁止語音" name="Block/Unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..a7006e524a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="精簡視野" name="compact_view"/>
+	<menu_item_check label="全展視野" name="expanded_view"/>
+	<menu_item_check label="顯示時間" name="IMShowTime"/>
+	<menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index f4f93b0bdc..9655732f2e 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="物件檔案..." name="Object Profile"/>
 	<menu_item_call label="封鎖…" name="Block"/>
+	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
+	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index e85b4b7182..258d0d6b20 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="新頭髮" name="New Hair"/>
 		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="展開全部資料夾" name="expand"/>
+	<menu_item_call label="摺疊全部資料夾" name="collapse"/>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
new file mode 100644
index 0000000000..8b35860eb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
+	<menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
+	<menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
+	<menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
+	<menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
+	<menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
+	<menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
+	<menu_item_check label="交談記錄……" name="Conversation"/>
+	<menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
+	<menu_item_check label="翻譯設定……" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..9a2a3c403d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="解除封鎖" name="unblock"/>
+	<menu_item_call label="檔案..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a8cecb4e14
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
+	<menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..5b70cd35bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依類型排序" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
new file mode 100644
index 0000000000..4251238fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依狀態排序" name="sort_status"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看許可權限" name="view_permissions"/>
+	<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index 5768c554c9..b4b566f5ca 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="語音通話" name="Call"/>
 	<menu_item_call label="啟動" name="Activate"/>
 	<menu_item_call label="退出" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
new file mode 100644
index 0000000000..05a30d938f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 38d5f3d324..d25adaf8fb 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="地圖" name="Map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="檢視聊天歷史……" name="chat_history"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 1380e0b307..69f0eab7dc 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="加為朋友" name="Add Friends"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friends"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="通話" name="call"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..9bc5638472
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依距離排序" name="sort_distance"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看地圖" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
new file mode 100644
index 0000000000..382234c3ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近排序" name="sort_most"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 592bb6561e..72629822d4 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示居民檔案" name="show_agent"/>
+	<menu_item_call label="察看檔案" name="show_agent"/>
+	<menu_item_call label="送出 IM..." name="send_im"/>
+	<menu_item_call label="加為朋友..." name="add_friend"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index b344b21c62..9f3a9d58ff 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示物件資訊" name="show_object"/>
+	<menu_item_call label="物件檔案..." name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ac0e9e7e35..09bdc57819 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
 			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="狀態" name="Status">
-			<menu_item_call label="離開" name="Set Away"/>
-			<menu_item_call label="忙碌" name="Set Busy"/>
-		</menu>
+		<menu label="狀態" name="Status"/>
 		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
 		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
 		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_check label="聊天…" name="Nearby Chat"/>
+		<menu_item_check label="交談……" name="Conversations"/>
+		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
 		<menu_item_check label="說話" name="Speak"/>
-		<menu_item_check label="語音設定…" name="Nearby Voice"/>
-		<menu_item_check label="語音變聲…" name="ShowVoice"/>
+		<menu label="語音變聲" name="VoiceMorphing">
+			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
+			<menu_item_check label="預覽……" name="Preview"/>
+			<menu_item_call label="訂閱……" name="Subscribe"/>
+		</menu>
 		<menu_item_check label="姿勢…" name="Gestures"/>
-		<menu_item_call label="朋友" name="My Friends"/>
-		<menu_item_call label="群組" name="My Groups"/>
-		<menu_item_call label="附近的人群" name="Active Speakers"/>
+		<menu_item_check label="朋友" name="My Friends"/>
+		<menu_item_check label="群組" name="My Groups"/>
+		<menu_item_check label="附近的人群" name="Active Speakers"/>
 		<menu_item_call label="封鎖清單" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -113,7 +114,6 @@
 			<menu_item_call label="購買" name="Menu Object Buy"/>
 			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
-			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
@@ -128,6 +128,7 @@
 			<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
+			<menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
@@ -157,6 +158,13 @@
 	<menu label="幫助" name="Help">
 		<menu_item_call label="簡易教學…" name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
+		<menu_item_call label="使用者指南" name="User’s guide"/>
+		<menu_item_call label="知識庫" name="Knowledge Base"/>
+		<menu_item_call label="維基" name="Wiki"/>
+		<menu_item_call label="社群論壇" name="Community Forums"/>
+		<menu_item_call label="支援入口" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
 		<menu_item_call label="違規舉報" name="Report Abuse"/>
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
@@ -383,9 +391,14 @@
 				<menu_item_call label="女性測試" name="Test Female"/>
 				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="動作速度" name="Animation Speed">
+				<menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/>
+				<menu_item_check label="慢動作" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
-			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
 			<menu_item_check label="顯示指向在" name="Show Point At"/>
 			<menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 9fecf2c104..59be26d43b 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -516,6 +516,24 @@
 		</url>
 		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=tw
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
 	<notification name="UnknownGPU">
 		你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
 原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。  這大概不會出問題，但你可能需要調整顯像設定。
@@ -1536,10 +1554,13 @@ SHA1 指紋：[MD5_DIGEST]
 		此時無法發出交友邀請。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="BusyModeSet">
-		已設為忙碌模式。
-聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。
-		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
+	<notification name="DoNotDisturbModeSet">
+		「請勿打擾」模式目前是開啟狀態。  你將不會收到任何發給你的訊息通知。
+
+- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 &gt; 一般設定」）。
+- 所有瞬間傳送的邀請都將被婉拒。
+- 所有語音來電都將拒絕接聽。
+		<usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。
@@ -2024,6 +2045,10 @@ SHA1 指紋：[MD5_DIGEST]
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
 		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		新增一個人到現有的交談，等於建立新的交談。  所有交談者將會收到新交談通知。
+		<usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
 		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
@@ -2098,14 +2123,14 @@ SHA1 指紋：[MD5_DIGEST]
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="忙碌模式警告" name="BusyModePay">
-		你現在處於忙碌模式，這意味著你付費後仍將不會收到任何物項。
+	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
+		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
 
-你是否要先離開忙碌模式，再完成交易？
+是否要在完成交易之前，先關閉「請勿打擾」模式？
 		<form name="form">
-			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
-			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
-			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
+			<ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/>
+			<button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
+			<button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2240,11 +2265,8 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="GroupNotice">
 		主旨：[SUBJECT]，訊息：[MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前在線上
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前離線
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		雖然你人很好，你還是不能把自己加為朋友。
@@ -2472,13 +2494,6 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="DynamicPathfindingDisabled">
 		這地區並未啟用動態尋徑。  使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		更改本地區的某些物件將導致其他移動物件的運作發生問題。  要使移動物件正常運作，請點按「重新產出地區」按鈕。  欲獲知詳情請選擇「幫助」。
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		發生錯誤。  問題可能出在網路或伺服器，也可能因為你無權建製物件。  有時，只要登出再登入即能解決這類問題。
 		<usetemplate name="okbutton" yestext="確定"/>
@@ -2741,7 +2756,7 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ScriptQuestionCaution">
 		警告：物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。
   
-這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
+如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
 		<form name="form">
 			<button name="Grant" text="允許全權存取"/>
 			<button name="Deny" text="拒絕"/>
@@ -3323,4 +3338,633 @@ SHA1 指紋：[MD5_DIGEST]
 		你正在刪除 [NUM_ITEMS] 個物項。  你確定你要繼續？
 		<usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		化身已凍結。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] 解除了對你的凍結。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		化身已解除凍結。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		凍結失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		你遭凍結的時間已過，請恢復正常活動。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		抱歉，無法凍結該用戶。
+	</notification>
+	<notification name="NowOwnObject">
+		你現在是物件 [OBJECT_NAME] 的所有人
+	</notification>
+	<notification name="CantRezOnLand">
+		無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。  請用土地工具察看所有人。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		無法產生物件，此刻要求數目過多。
+	</notification>
+	<notification name="SitFailCantMove">
+		你無法坐下，因為此刻你不能移動。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		你不能坐下，因為該土地不允許。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		請挨近一點。  無法坐在物件上，因為
+它和你不在同一個地區。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		無法建立新物件。 地區已滿載。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		你無法在別人的土地上建立樹和草。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		複製失敗，你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		選取了沒有根的重覆物件。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		無法複製物件，因為地區滿載。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		無法複製物件，找不到它們所在的地段。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		無法建立物件，因為 
+地段滿載。
+	</notification>
+	<notification name="RezAttemptFailed">
+		試圖產生物件失敗。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		無法建立已在此地區造成問題的物件。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		該收納區物項已被列入黑名單。
+	</notification>
+	<notification name="NoCanRezObjects">
+		你此時無權建立物件。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地搜尋遭禁。
+你在短時間內進行了太多次土地搜尋。
+請稍候再試。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		你已經死亡並且被瞬間傳送回你的家的位置
+	</notification>
+	<notification name="EjectComingSoon">
+		你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。
+	</notification>
+	<notification name="NoEnterServerFull">
+		你無法進入這地區，因為 
+伺服器滿載。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「儲存回收納區」功能已被停用。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容，因為產生它的來源物件已不存在。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		無法儲存 [OBJ_NAME] 到物件內容，你無權修改 &apos;[DEST_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區，此動作已被停用。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		無法複製你所選的，因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoTransNoCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		無法儲存你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		無法儲存你所選的，因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
+	</notification>
+	<notification name="NoModNoTaking">
+		無法拿取你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="RezDestInternalError">
+		內部錯誤：未知的目的地類型。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		刪除失敗，因為找不到物件
+	</notification>
+	<notification name="SorryCantEjectUser">
+		抱歉，無法踢出該用戶。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="HomeLocationLimits">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="HomePositionSet">
+		我的家位置已定。
+	</notification>
+	<notification name="AvatarEjected">
+		化身已被踢出。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		踢出失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]）
+	</notification>
+	<notification name="NoPermModifyObject">
+		你無權變更該物件
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		對導航網面有貢獻的物件，無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		鍵格動畫物件無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		無法啟用物件的物理——土地資源不足。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。
+	</notification>
+	<notification name="UnableAddItem">
+		無法新增項目！
+	</notification>
+	<notification name="UnableEditItem">
+		無法編輯這項目！
+	</notification>
+	<notification name="NoPermToEdit">
+		無權編輯這項目。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		無權複製該收納區。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		無法儲存到物件內容：該項目已不存在。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		無法儲存到物件內容：收納區已存在同名稱的項目
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		無法儲存到物件內容：這麼做將修改附件的權限。
+	</notification>
+	<notification name="TooManyScripts">
+		腳本太多。
+	</notification>
+	<notification name="UnableAddScript">
+		無法新增腳本！
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資產伺服器未在正常時間內反應。  物件已返交模擬器。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		本地區未啟用物理形狀。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		你無法變更跨越地區界限的導航網面。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		該物件類型不得設定物理性質。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		根幾何元件無法設成無形狀。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		本地區未啟用物理材料。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		只能調整根幾何元件的物理材料。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		尚不支援角色設定物理材料。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定的物理材料屬性中，至少有一個無效。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		網面物件的縫合類型不得變更。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		網面物件的形狀不得變更。
+	</notification>
+	<notification name="FullRegionCantEnter">
+		你無法進入這地區，\n因為地區滿載。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		聯結失敗——所有人不同
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		聯結失敗——無法修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		聯結失敗，你無權編輯。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		聯結失敗——幾何元件太多
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		聯結失敗——沒有可聯結的東西。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		聯結失敗——尋徑角色太多
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		聯結失敗——土地資源不足
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		物件使用了過多物理資源，其動態特性已被停用。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
+	</notification>
+	<notification name="TeleportedByAttachment">
+		你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		無法建立要求的物件。 地區已滿載。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		你不能將多個物件附著到同一個點。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		你不能在此建立多個物件。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		無法建立要求的物件。 物件在資料庫中找不到。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		無法建立要求的物件。 要求逾時，無法完成。 請再試一次。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		無法建立要求的物件。 請再試一次。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		物件產生失敗，要求的物件載入時間太久。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		你不得在這土地上建立植物。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		無法恢復物件。 找不到虛擬世界的位置。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		無法產生物件，它的網面資料無效。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		無法產生物件，因為這地區已有太多的腳本。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		你無權在此建立物件。
+	</notification>
+	<notification name="CantCreateObject">
+		你此時無權建立物件。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無效的物件參數
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		你權限不夠，無法在此複製物件。
+	</notification>
+	<notification name="CantChangeShape">
+		你無權變更這個形狀。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		你權限不夠，無法在此收取物件。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		讓渡失敗，你無權為你的群組讓渡物件。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		你權限不夠，無法在此購買物件。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		無法附著物件，有個化身正坐在物件上。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		樹和草不能當附件穿戴。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		無法附著群組所擁有的物件。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		無法附著不是你擁有的物件。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		無法附著對導航網面有貢獻的物件。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		無法附著物件，你無權移動該物件。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		你無法在此卸除物件，請到「自由嘗試」區域再試。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		卸除附件失敗：你無權在此處卸除。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		卸除附件失敗：可用土地資源不足。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		卸除附件失敗：可用資源不足。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		無法在此卸除物件。  地段滿載。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		無法觸摸/抓取此物件，因為你在該土地地段遭禁。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		請將刪除參數範圍調小一點。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		無法上傳資產。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		找不到要瞬間傳送到家的用戶
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		要求神的權力失敗
+	</notification>
+	<notification name="GenericRequestFailed">
+		普通請求失敗
+	</notification>
+	<notification name="CantUploadPostcard">
+		無法上傳明信片。  請稍候再試一次。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		無法取得群組通知的收納區細節。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		無法送出群組通知——未准許。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		無法送出群組通知——收納區建立失敗。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		無法剖析通知裡的收納品項。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形上傳失敗。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形檔案已寫入。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形檔案已寫入，開始下載……
+	</notification>
+	<notification name="TerrainBaked">
+		地形已定貌。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		你必須先更新瀏覽器後，才可購買這個地段。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		無法購買，此地段不供出售。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		無法購買，售價或土地面積已變。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		你不是此地段的獲授權的買主。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		你無法購買此地段，該地段已在等候批准購買
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		你不得在此建立物件，這麼做將導致地段超載。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		未選取足夠租用地段，無法合併。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地分割成功。
+	</notification>
+	<notification name="PassPurchased">
+		你購買了通行權。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		地區不允許分類廣告。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		你在此土地的通行權即將到期失效。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		沒有合適的表面讓你坐下，請試一試別處。
+	</notification>
+	<notification name="CantSitNoRoom">
+		這裡沒有空間讓你坐下，請試試另一處。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		收取物件失敗，因為你權限不足。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		收取物件失敗，因為你 L$ 金額不足。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		無法讓渡群組所擁有的土地。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		購買物件失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		購買收納區失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		你的 L$ 不足，無法購買此土地的通行權。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		此時無法購買通行權。  請稍候再試一次。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		無法建立物件，\n地段滿載。
+	</notification>
+	<notification name="FailedPlacingObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		無法為活動建立地標。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		你擁有的神力解除了凍結！
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		要求特殊能力失敗。 該要求已載入記錄。
+	</notification>
+	<notification name="ExpireExplanation">
+		系統此時無法處理你的要求。 要求逾時，無法完成。
+	</notification>
+	<notification name="DieExplanation">
+		系統無法處理你的要求。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		金額不足，無法建立幾何元件。
+	</notification>
+	<notification name="RezObjectFailure">
+		金額不足，無法建立物件。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		已重設「我的家」位置，因為前一個位置不合法。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="SetHomePosition">
+		我的家位置已定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		收納區出錯，無法收納物件。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		無法建立要求的收納區。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		無法建立要求的收納區資料夾。
+	</notification>
+	<notification name="CantCreateInventory">
+		無法建立該收納區。
+	</notification>
+	<notification name="CantCreateLandmark">
+		無法建立地標。
+	</notification>
+	<notification name="CantCreateOutfit">
+		此時無法建立裝扮。 請過一分鐘後再試。
+	</notification>
+	<notification name="InventoryNotForSale">
+		收納區沒有待售。
+	</notification>
+	<notification name="CantFindInvItem">
+		找不到收納區物項。
+	</notification>
+	<notification name="CantFindObject">
+		找不到物件。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		此地區目前未啟用轉移金錢給物件的功能。
+	</notification>
+	<notification name="CantPayNoAgent">
+		無法決定付款給誰。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		你無法將 L$ 送給公共物件。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		針對虛擬世界物件建立收納區失敗。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		發生內部錯誤，我們無法如常更新你的瀏覽器。  你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		無法建立和其他參與者發生交截的大型幾何元件。  請等其他參與者移開後再試。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		這動作將刪除先前交談的記錄，和所有記錄備份。
+		<usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
+		<usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		無法移動檔案。 已恢復前一個路徑。
+		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index 1c8b56b3d6..e0a49a0add 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
 	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
 	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 1dfa024138..9f59bb32f8 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		封鎖清單
-	</text>
-	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
-	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
-	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
-	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="過濾器" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
+		<menu_button name="view_btn" tool_tip="排序選項"/>
+		<menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/>
+		<button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..6524d41645
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（載入中）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..8446ce2130
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="包含語音交談"/>
+	<icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
+	<button name="delete_btn" tool_tip="移除此項目"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index 175293cdf7..fec4bb572a 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 59ea7b70e2..5f7aca387a 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
-	<string name="people_filter_label" value="人員過濾器"/>
-	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
-	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
-		<panel label="我的朋友" name="friends_panel">
+		<panel label="朋友" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人員過濾器" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="我的群組" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+		<panel label="群組" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="群組過濾器" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人員過濾器" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
+		<panel label="已封鎖的" name="blocked_panel">
+			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index cf2f81d313..e700e35516 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<text name="font_size">
-		字型尺寸：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
-	<check_box label="聊天泡泡" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		顯示 IMs 於：
-	</text>
-	<text name="requires_restart_label">
-		（須重新啟動）
-	</text>
-	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
-		<radio_item label="分開視窗" name="radio" value="0"/>
-		<radio_item label="頁籤" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		啟用傳入聊天的突顯示視窗：
-	</text>
-	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
-	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
-	<spinner label="附近聊天內容提示框停駐時間：" name="nearby_toasts_lifetime"/>
-	<spinner label="附近聊天內容提示框消退時間：" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+		<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			字型尺寸：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="聊天泡泡" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			通知
+		</text>
+		<text name="friend_ims">
+			朋友 IM：
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			非朋友 IM：
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="conference_ims">
+			多方交談 IM：
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="group_chat">
+			群組聊天：
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="nearby_chat">
+			附近的聊天：
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="notifications_alert">
+			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			播放聲音：
+		</text>
+		<check_box label="新交談" name="new_conversation"/>
+		<check_box label="語音通話來電" name="incoming_voice_call"/>
+		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
+		<check_box label="收納物品贈送" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="清空記錄……" name="clear_log"/>
+		<button label="刪除交談內容記錄……" name="delete_transcripts"/>
+		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
+	</panel>
 	<button label="翻譯…" name="ok_btn"/>
 	<button label="自動取代…" name="autoreplace_showgui"/>
 	<button label="拼字檢查…" name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 7e67a0d02d..044edbed70 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		忙碌模式回應：
+		「請勿打擾」預設回應：
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 982dde4010..60f44a3d88 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="購買物件" name="Buyobject"/>
 			<combo_box.item label="支付物件" name="Payobject"/>
 			<combo_box.item label="打開" name="Open"/>
+			<combo_box.item label="縮放" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 7e17ed6864..31713ac281 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="AvatarAway">
 		離開
 	</string>
-	<string name="AvatarBusy">
-		忙碌
+	<string name="AvatarDoNotDisturb">
+		請勿打擾
 	</string>
 	<string name="AvatarMuted">
 		封鎖的
@@ -851,6 +851,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ST_NO_JOINT">
 		找不到 ROOT 或旋軸。
 	</string>
+	<string name="NearbyChatTitle">
+		附近的聊天中
+	</string>
+	<string name="NearbyChatLabel">
+		（附近的聊天）
+	</string>
 	<string name="whisper">
 		低語：
 	</string>
@@ -914,12 +920,15 @@ http://secondlife.com/viewer-access-faq
 	<string name="ControlYourCamera">
 		控制你的攝影機
 	</string>
-	<string name="TeleportYourAgent">
-		瞬間傳送你本人
-	</string>
 	<string name="NotConnected">
 		未聯接
 	</string>
+	<string name="AgentNameSubst">
+		（你）
+	</string>
+	<string name="TeleportYourAgent">
+		瞬間傳送你本人
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -1001,18 +1010,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="dictionary_files">
 		字典
 	</string>
-	<string name="AvatarSetNotAway">
-		非離開
-	</string>
-	<string name="AvatarSetAway">
-		離開
-	</string>
-	<string name="AvatarSetNotBusy">
-		非忙碌
-	</string>
-	<string name="AvatarSetBusy">
-		忙碌
-	</string>
 	<string name="shape">
 		體形
 	</string>
@@ -1981,8 +1978,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="PanelContentsNewScript">
 		新腳本
 	</string>
-	<string name="BusyModeResponseDefault">
-		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
+	<string name="DoNotDisturbModeResponseDefault">
+		這居民處於「請勿打擾」狀態，不會立即看到你的訊息。
 	</string>
 	<string name="MuteByName">
 		（按名稱）
@@ -2095,9 +2092,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		內容
-	</string>
 	<string name="AcquiredItems">
 		取得物品
 	</string>
@@ -3869,7 +3863,7 @@ http://secondlife.com/viewer-access-faq
 		一般普級地區
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		可看到本地段外的化身，並與之交談
+		這地段外的其他化身，看不見也聽不到位於地段裡的化身
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地區重新產出之前，可移動物件可能無法正常運作。
@@ -3946,6 +3940,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="IM_unblock_only_groups_friends">
 		要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
 	</string>
+	<string name="OnlineStatus">
+		上線
+	</string>
+	<string name="OfflineStatus">
+		離線
+	</string>
 	<string name="answered_call">
 		你的通話已經接通
 	</string>
@@ -3955,6 +3955,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="you_joined_call">
 		你發起了語音通話
 	</string>
+	<string name="you_auto_rejected_call-im">
+		因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。
+	</string>
 	<string name="name_started_call">
 		[NAME] 發起了語音通話
 	</string>
@@ -3971,7 +3974,7 @@ http://secondlife.com/viewer-access-faq
 		聯接中...
 	</string>
 	<string name="conference-title">
-		臨時多方通話
+		多人聊天
 	</string>
 	<string name="conference-title-incoming">
 		和 [AGENT_NAME] 多方通話
@@ -4863,6 +4866,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Label">
 		聊天
 	</string>
+	<string name="Command_Conversations_Label">
+		交談
+	</string>
 	<string name="Command_Compass_Label">
 		羅盤
 	</string>
@@ -4938,6 +4944,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Tooltip">
 		透過文字和附近人們聊天
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		和所有人交談
+	</string>
 	<string name="Command_Compass_Tooltip">
 		指南針
 	</string>
@@ -5067,4 +5076,13 @@ http://secondlife.com/viewer-access-faq
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
+	</string>
 </strings>
-- 
cgit v1.2.3


From d2c9543a19fa4ed008bbda841885bd1f34c289a0 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 26 Apr 2013 06:39:08 +0300
Subject: CHUI-859 FIXED Conversation panel moves when new message received
 with Open Conversation window preference

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index a56b90a29d..2d605bc010 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -129,7 +129,7 @@
          auto_resize="true"
          user_resize="true"
          name="messages_layout_panel"
-         expanded_min_dim="183">
+         expanded_min_dim="212">
             <panel_container
              bottom="-1"
              follows="all"
-- 
cgit v1.2.3


From 503605641a6285064765b6057dbad67df84140e2 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 29 Apr 2013 23:01:07 +0300
Subject: CHUI-956 FIXED Vertical scrollbar in conversation list not scrolls
 off bottom

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 2d605bc010..da016462db 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -24,7 +24,7 @@
      value="Conv_toolbar_expand"/>
     <layout_stack
      animate="true" 
-     bottom="-1"
+     bottom="-5"
      drag_handle_gap="6"
      drag_handle_first_indent="27"
      drag_handle_second_indent="10"
-- 
cgit v1.2.3


From d07fab9e165e354678f5f8f78d331f8cfe8618d2 Mon Sep 17 00:00:00 2001
From: PavelK ProductEngine <pkrivich@productengine.com>
Date: Thu, 25 Apr 2013 18:47:09 +0300
Subject: CHUI-759 FIXED Group invites never received in do not disturb mode
 when leaving do not disturb mode

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 49e2ddfb14..bb3044a0d5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6524,7 +6524,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="JoinGroup"
    persist="true"
-   type="notify">
+   type="offer">
     <tag>group</tag>
 [MESSAGE]
     <form name="form">
-- 
cgit v1.2.3


From 5d50e2d02d7e7c63b47df1b5208ff759987068b1 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 30 Apr 2013 11:27:08 -0700
Subject: MAINT-2640 Fix for Wrong name of the checkbox Pathfinding view/test
 floater.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 79f2027c31..2629313069 100755
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -152,7 +152,7 @@
       </text>
       <check_box
           height="19"
-          label="Test"
+          label="World"
           layout="topleft"
           name="show_world"
           top_pad="4"
-- 
cgit v1.2.3


From d659b29f6ca180cac774e4576bba9da791510633 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 30 Apr 2013 13:44:35 -0700
Subject: Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XML

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7c08aef65e..b6fd14e033 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -372,6 +372,8 @@ Please try logging in again in a minute.</string>
 	<!-- build floater -->
 	<string name="multiple_textures">Multiple</string>
 
+<string name="use_texture">Use texture</string>
+
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>
-- 
cgit v1.2.3


From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 30 Apr 2013 19:50:05 -0700
Subject: Merge 3.5.1 into Materials

---
 .../default/xui/de/floater_conversation_log.xml    |   8 +
 .../xui/de/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/de/floater_im_container.xml  |  29 +-
 .../skins/default/xui/de/floater_im_session.xml    |  61 +-
 .../skins/default/xui/de/floater_incoming_call.xml |  10 +-
 .../default/xui/de/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/de/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/de/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/de/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/de/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/de/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/de/menu_conversation.xml     |  31 +
 .../default/xui/de/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/de/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/de/menu_im_conversation.xml  |  15 +
 .../default/xui/de/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/de/menu_object_icon.xml      |   2 +
 .../skins/default/xui/de/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/de/menu_participant_view.xml |  13 +
 .../default/xui/de/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/de/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/de/menu_people_blocked_view.xml    |   5 +
 .../default/xui/de/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/de/menu_people_groups.xml    |   2 +-
 .../default/xui/de/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/de/menu_people_nearby.xml    |  23 +-
 .../xui/de/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/de/menu_people_nearby_view.xml     |   8 +
 .../default/xui/de/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/de/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/de/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |  31 +-
 .../newview/skins/default/xui/de/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/de/panel_avatar_list_item.xml      |   1 +
 .../default/xui/de/panel_block_list_sidetray.xml   |  15 +-
 .../xui/de/panel_conversation_list_item.xml        |   8 +
 .../xui/de/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/de/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/de/panel_people.xml  |  88 +--
 .../default/xui/de/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/de/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/de/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/de/strings.xml     |  68 +-
 .../skins/default/xui/en/floater_im_session.xml    |  62 +-
 .../newview/skins/default/xui/en/floater_tools.xml |  12 +-
 .../skins/default/xui/en/menu_attachment_other.xml |   8 +
 .../skins/default/xui/en/menu_attachment_self.xml  |   8 +
 .../skins/default/xui/en/menu_avatar_other.xml     |   8 +
 .../skins/default/xui/en/menu_avatar_self.xml      |   8 +
 indra/newview/skins/default/xui/en/menu_login.xml  |  15 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |   5 +-
 indra/newview/skins/default/xui/en/strings.xml     |   4 +-
 .../default/xui/es/floater_conversation_log.xml    |   8 +
 .../xui/es/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/es/floater_im_container.xml  |  29 +-
 .../skins/default/xui/es/floater_im_session.xml    |  61 +-
 .../skins/default/xui/es/floater_incoming_call.xml |  10 +-
 .../default/xui/es/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/es/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/es/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/es/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/es/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/es/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/es/menu_conversation.xml     |  31 +
 .../default/xui/es/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/es/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/es/menu_im_conversation.xml  |  15 +
 .../default/xui/es/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/es/menu_object_icon.xml      |   2 +
 .../skins/default/xui/es/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/es/menu_participant_view.xml |  13 +
 .../default/xui/es/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/es/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/es/menu_people_blocked_view.xml    |   5 +
 .../default/xui/es/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/es/menu_people_groups.xml    |   2 +-
 .../default/xui/es/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/es/menu_people_nearby.xml    |  23 +-
 .../xui/es/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/es/menu_people_nearby_view.xml     |   8 +
 .../default/xui/es/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/es/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/es/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml |  19 +-
 .../newview/skins/default/xui/es/notifications.xml | 692 ++++++++++++++++++++-
 .../default/xui/es/panel_avatar_list_item.xml      |   1 +
 .../default/xui/es/panel_block_list_sidetray.xml   |  15 +-
 .../xui/es/panel_conversation_list_item.xml        |   8 +
 .../xui/es/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/es/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/es/panel_people.xml  |  88 +--
 .../default/xui/es/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/es/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/es/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/es/strings.xml     |  63 +-
 .../default/xui/fr/floater_conversation_log.xml    |   8 +
 .../xui/fr/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/fr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/fr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/fr/floater_incoming_call.xml |  10 +-
 .../default/xui/fr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/fr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/fr/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/fr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/fr/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/fr/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/fr/menu_conversation.xml     |  31 +
 .../default/xui/fr/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/fr/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/fr/menu_im_conversation.xml  |  15 +
 .../default/xui/fr/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/fr/menu_object_icon.xml      |   2 +
 .../skins/default/xui/fr/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/fr/menu_participant_view.xml |  13 +
 .../default/xui/fr/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/fr/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/fr/menu_people_blocked_view.xml    |   5 +
 .../default/xui/fr/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/fr/menu_people_groups.xml    |   2 +-
 .../default/xui/fr/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/fr/menu_people_nearby.xml    |  23 +-
 .../xui/fr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/fr/menu_people_nearby_view.xml     |   8 +
 .../default/xui/fr/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/fr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/fr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/fr/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/fr/panel_avatar_list_item.xml      |   1 +
 .../default/xui/fr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/fr/panel_conversation_list_item.xml        |   8 +
 .../xui/fr/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/fr/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/fr/panel_people.xml  |  88 +--
 .../default/xui/fr/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/fr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/fr/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/fr/strings.xml     |  68 +-
 .../default/xui/it/floater_conversation_log.xml    |   8 +
 .../xui/it/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/it/floater_im_container.xml  |  29 +-
 .../skins/default/xui/it/floater_im_session.xml    |  61 +-
 .../skins/default/xui/it/floater_incoming_call.xml |  10 +-
 .../default/xui/it/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/it/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/it/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/it/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/it/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/it/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/it/menu_conversation.xml     |  31 +
 .../default/xui/it/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/it/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/it/menu_im_conversation.xml  |  15 +
 .../default/xui/it/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/it/menu_object_icon.xml      |   2 +
 .../skins/default/xui/it/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/it/menu_participant_view.xml |  13 +
 .../default/xui/it/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/it/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/it/menu_people_blocked_view.xml    |   5 +
 .../default/xui/it/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/it/menu_people_groups.xml    |   2 +-
 .../default/xui/it/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/it/menu_people_nearby.xml    |  23 +-
 .../xui/it/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/it/menu_people_nearby_view.xml     |   8 +
 .../default/xui/it/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/it/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/it/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/it/notifications.xml | 692 ++++++++++++++++++++-
 .../default/xui/it/panel_avatar_list_item.xml      |   1 +
 .../default/xui/it/panel_block_list_sidetray.xml   |  15 +-
 .../xui/it/panel_conversation_list_item.xml        |   8 +
 .../xui/it/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/it/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/it/panel_people.xml  |  88 +--
 .../default/xui/it/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/it/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/it/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/it/strings.xml     |  63 +-
 .../default/xui/ja/floater_conversation_log.xml    |   8 +
 .../xui/ja/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/ja/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ja/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |  10 +-
 .../default/xui/ja/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/ja/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |  31 +
 .../default/xui/ja/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/ja/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/ja/menu_im_conversation.xml  |  15 +
 .../default/xui/ja/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/ja/menu_object_icon.xml      |   2 +
 .../skins/default/xui/ja/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/ja/menu_participant_view.xml |  13 +
 .../default/xui/ja/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/ja/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/ja/menu_people_blocked_view.xml    |   5 +
 .../default/xui/ja/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/ja/menu_people_groups.xml    |   2 +-
 .../default/xui/ja/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/ja/menu_people_nearby.xml    |  23 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |   8 +
 .../default/xui/ja/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/ja/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/ja/notifications.xml | 686 +++++++++++++++++++-
 .../default/xui/ja/panel_avatar_list_item.xml      |   1 +
 .../default/xui/ja/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ja/panel_conversation_list_item.xml        |   8 +
 .../xui/ja/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/ja/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/ja/panel_people.xml  |  90 +--
 .../default/xui/ja/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/ja/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/ja/strings.xml     |  68 +-
 .../default/xui/pt/floater_conversation_log.xml    |   8 +
 .../xui/pt/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/pt/floater_im_container.xml  |  29 +-
 .../skins/default/xui/pt/floater_im_session.xml    |  61 +-
 .../skins/default/xui/pt/floater_incoming_call.xml |   8 +-
 .../default/xui/pt/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/pt/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/pt/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/pt/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/pt/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/pt/menu_cof_gear.xml |   6 +-
 .../skins/default/xui/pt/menu_conversation.xml     |  31 +
 .../default/xui/pt/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/pt/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/pt/menu_im_conversation.xml  |  15 +
 .../default/xui/pt/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/pt/menu_object_icon.xml      |   2 +
 .../skins/default/xui/pt/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/pt/menu_participant_view.xml |  13 +
 .../default/xui/pt/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/pt/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/pt/menu_people_blocked_view.xml    |   5 +
 .../default/xui/pt/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/pt/menu_people_groups.xml    |   2 +-
 .../default/xui/pt/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/pt/menu_people_nearby.xml    |  23 +-
 .../xui/pt/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/pt/menu_people_nearby_view.xml     |   8 +
 .../default/xui/pt/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/pt/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/pt/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/pt/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/pt/panel_avatar_list_item.xml      |   1 +
 .../default/xui/pt/panel_block_list_sidetray.xml   |  15 +-
 .../xui/pt/panel_conversation_list_item.xml        |   8 +
 .../xui/pt/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/pt/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/pt/panel_people.xml  |  88 +--
 .../default/xui/pt/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/pt/panel_preferences_general.xml   |   5 +-
 .../skins/default/xui/pt/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/pt/strings.xml     |  63 +-
 .../default/xui/ru/floater_conversation_log.xml    |   8 +
 .../xui/ru/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/ru/floater_im_container.xml  |  29 +-
 .../skins/default/xui/ru/floater_im_session.xml    |  61 +-
 .../skins/default/xui/ru/floater_incoming_call.xml |  10 +-
 .../default/xui/ru/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ru/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/ru/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/ru/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/ru/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/ru/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/ru/menu_conversation.xml     |  31 +
 .../default/xui/ru/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/ru/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/ru/menu_im_conversation.xml  |  15 +
 .../default/xui/ru/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/ru/menu_object_icon.xml      |   2 +
 .../skins/default/xui/ru/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/ru/menu_participant_view.xml |  13 +
 .../default/xui/ru/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/ru/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/ru/menu_people_blocked_view.xml    |   5 +
 .../default/xui/ru/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/ru/menu_people_groups.xml    |   2 +-
 .../default/xui/ru/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/ru/menu_people_nearby.xml    |  23 +-
 .../xui/ru/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/ru/menu_people_nearby_view.xml     |   8 +
 .../default/xui/ru/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/ru/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/ru/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/ru/notifications.xml | 689 +++++++++++++++++++-
 .../default/xui/ru/panel_avatar_list_item.xml      |   1 +
 .../default/xui/ru/panel_block_list_sidetray.xml   |  15 +-
 .../xui/ru/panel_conversation_list_item.xml        |   8 +
 .../xui/ru/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/ru/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/ru/panel_people.xml  |  88 +--
 .../default/xui/ru/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/ru/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/ru/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/ru/strings.xml     |  66 +-
 .../default/xui/tr/floater_conversation_log.xml    |   8 +
 .../xui/tr/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/tr/floater_im_container.xml  |  29 +-
 .../skins/default/xui/tr/floater_im_session.xml    |  61 +-
 .../skins/default/xui/tr/floater_incoming_call.xml |  10 +-
 .../default/xui/tr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/tr/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/tr/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/tr/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/tr/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/tr/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/tr/menu_conversation.xml     |  31 +
 .../default/xui/tr/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/tr/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/tr/menu_im_conversation.xml  |  15 +
 .../default/xui/tr/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/tr/menu_object_icon.xml      |   2 +
 .../skins/default/xui/tr/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/tr/menu_participant_view.xml |  13 +
 .../default/xui/tr/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/tr/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/tr/menu_people_blocked_view.xml    |   5 +
 .../default/xui/tr/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/tr/menu_people_groups.xml    |   2 +-
 .../default/xui/tr/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/tr/menu_people_nearby.xml    |  23 +-
 .../xui/tr/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/tr/menu_people_nearby_view.xml     |   8 +
 .../default/xui/tr/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/tr/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/tr/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/tr/notifications.xml | 683 +++++++++++++++++++-
 .../default/xui/tr/panel_avatar_list_item.xml      |   1 +
 .../default/xui/tr/panel_block_list_sidetray.xml   |  15 +-
 .../xui/tr/panel_conversation_list_item.xml        |   8 +
 .../xui/tr/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/tr/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/tr/panel_people.xml  |  88 +--
 .../default/xui/tr/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/tr/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/tr/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/tr/strings.xml     |  68 +-
 .../default/xui/zh/floater_conversation_log.xml    |   8 +
 .../xui/zh/floater_conversation_preview.xml        |   7 +
 .../skins/default/xui/zh/floater_im_container.xml  |  29 +-
 .../skins/default/xui/zh/floater_im_session.xml    |  61 +-
 .../skins/default/xui/zh/floater_incoming_call.xml |   8 +-
 .../default/xui/zh/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/zh/floater_texture_ctrl.xml  |   2 +-
 .../default/xui/zh/floater_voice_chat_volume.xml   |   4 +
 .../skins/default/xui/zh/floater_voice_effect.xml  |   2 +-
 .../skins/default/xui/zh/floater_voice_volume.xml  |   8 +
 .../newview/skins/default/xui/zh/menu_cof_gear.xml |   2 +-
 .../skins/default/xui/zh/menu_conversation.xml     |  31 +
 .../default/xui/zh/menu_conversation_log_gear.xml  |  15 +
 .../default/xui/zh/menu_conversation_log_view.xml  |   7 +
 .../skins/default/xui/zh/menu_im_conversation.xml  |  15 +
 .../default/xui/zh/menu_im_session_showmodes.xml   |   7 +
 .../skins/default/xui/zh/menu_object_icon.xml      |   2 +
 .../skins/default/xui/zh/menu_outfit_gear.xml      |   2 +
 .../skins/default/xui/zh/menu_participant_view.xml |  13 +
 .../default/xui/zh/menu_people_blocked_gear.xml    |   5 +
 .../default/xui/zh/menu_people_blocked_plus.xml    |   5 +
 .../default/xui/zh/menu_people_blocked_view.xml    |   5 +
 .../default/xui/zh/menu_people_friends_view.xml    |   8 +
 .../skins/default/xui/zh/menu_people_groups.xml    |   2 +-
 .../default/xui/zh/menu_people_groups_view.xml     |   4 +
 .../skins/default/xui/zh/menu_people_nearby.xml    |  23 +-
 .../xui/zh/menu_people_nearby_multiselect.xml      |  14 +-
 .../default/xui/zh/menu_people_nearby_view.xml     |   8 +
 .../default/xui/zh/menu_people_recent_view.xml     |   6 +
 .../skins/default/xui/zh/menu_url_agent.xml        |   4 +-
 .../skins/default/xui/zh/menu_url_objectim.xml     |   2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  21 +-
 .../newview/skins/default/xui/zh/notifications.xml | 690 +++++++++++++++++++-
 .../default/xui/zh/panel_avatar_list_item.xml      |   1 +
 .../default/xui/zh/panel_block_list_sidetray.xml   |  15 +-
 .../xui/zh/panel_conversation_list_item.xml        |   8 +
 .../xui/zh/panel_conversation_log_list_item.xml    |   6 +
 .../skins/default/xui/zh/panel_group_list_item.xml |   1 +
 .../newview/skins/default/xui/zh/panel_people.xml  |  88 +--
 .../default/xui/zh/panel_preferences_chat.xml      | 110 +++-
 .../default/xui/zh/panel_preferences_general.xml   |   4 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   |   1 +
 indra/newview/skins/default/xui/zh/strings.xml     |  66 +-
 396 files changed, 10336 insertions(+), 1734 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_log.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_voice_volume.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_im_conversation.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_participant_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
new file mode 100644
index 0000000000..19620a0fc9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL">
+	<panel name="buttons_panel">
+		<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
new file mode 100644
index 0000000000..010ad19076
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="UNTERHALTUNG:">
+	<floater.string name="Title">
+		UNTERHALTUNG: [NAME]
+	</floater.string>
+	<text name="page_label" value="Seite"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 95eda97938..5bf916c8e9 100644
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="GESPRÄCHE"/>
+<multi_floater name="floater_im_box" title="GESPRÄCHE">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+					<button name="add_btn" tool_tip="Neue Unterhaltung starten"/>
+					<button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/>
+					<text name="stub_textbox">
+						Diese Unterhaltung erscheint in einem separaten Fenster.   [secondlife:/// Zurückholen.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index abaf275651..f96eb72cb1 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="An" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/>
+	<floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/>
+	<floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/>
+	<floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/>
+	<floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/>
+	<floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/>
+				<button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/>
+				<button name="close_btn" tool_tip="Diese Unterhaltung beenden"/>
+				<button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="An" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index 213d9f54f5..f13842f479 100644
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		Anonym
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ruft an.
+		ruft Sie an.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ist einem Voice-Konferenz-Chat beigetreten.
@@ -25,9 +25,9 @@
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
-		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
+		Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet.
 	</text>
-	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
-	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
-	<button label="IM starten" name="Start IM"/>
+	<button label="Annehmen" label_selected="Annehmen" name="Accept"/>
+	<button label="Ignorieren" label_selected="Ignorieren" name="Reject"/>
+	<button label="Stattdessen IM öffnen" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index ebf8f01632..88e9f53a4c 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Anzeigen:
 			</text>
-			<check_box label="Welt" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 9585622516..b794d879f0 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Leer" label_selected="Leer" name="Blank"/>
 	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Live-Vorschau" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vorschau deaktiviert"/>
 	<filter_editor label="Texturen filtern" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..15259639e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE">
+	<slider label="Voice-Chat" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 413a46525c..8d37950480 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE MORPHING">
+<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
new file mode 100644
index 0000000000..258627c94f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="LAUTSTÄRKE">
+	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
index 54b218d22f..2dd871b2ea 100644
--- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
-	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
new file mode 100644
index 0000000000..30d3ab79e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
+	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
+	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Voice ignorieren" name="block_unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+	<menu_item_call label="Gruppenprofil" name="group_profile"/>
+	<menu_item_call label="Gruppe aktivieren" name="activate_group"/>
+	<menu_item_call label="Gruppe verlassen" name="leave_group"/>
+	<context_menu label="Moderatoroptionen" name="Moderator Options">
+		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
+		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
+		<menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..2ef8762128
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Voice-Anruf..." name="Call"/>
+	<menu_item_call label="Chatverlauf öffnen..." name="Chat history"/>
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="Invite"/>
+	<menu_item_call label="Karte" name="Map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..ae3cc5bc97
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
+	<menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/>
+	<menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
new file mode 100644
index 0000000000..875524b19d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..48f62d29a1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Kompaktansicht" name="compact_view"/>
+	<menu_item_check label="Erweiterte Ansicht" name="expanded_view"/>
+	<menu_item_check label="Zeit anzeigen" name="IMShowTime"/>
+	<menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index 8b6c558416..f92fa0f82b 100644
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Objektprofil..." name="Object Profile"/>
 	<menu_item_call label="Ignorieren..." name="Block"/>
+	<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
+	<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index d56c93533c..0cf3c09882 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Neues Haar" name="New Hair"/>
 		<menu_item_call label="Neue Augen" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Alle Ordner erweitern" name="expand"/>
+	<menu_item_call label="Alle Ordner schließen" name="collapse"/>
 	<menu_item_call label="Outfit neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml
new file mode 100644
index 0000000000..6ceb9ac4c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/>
+	<menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/>
+	<menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/>
+	<menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/>
+	<menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/>
+	<menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/>
+	<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/>
+	<menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/>
+	<menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..f69a453e58
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Nicht mehr ignorieren" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..041fde139d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/>
+	<menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..1dae593ebe
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Typ sortieren" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
new file mode 100644
index 0000000000..da4890fe96
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
+	<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
index 76225ba241..a69c82d3d8 100644
--- a/indra/newview/skins/default/xui/de/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Info anzeigen" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Voice-Anruf" name="Call"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Verlassen" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
new file mode 100644
index 0000000000..20386bba56
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index 1db964357f..cdbb3ae917 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Karte" name="Map"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index b6e99edfe1..ba6578e2d1 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
-	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Anrufen" name="call"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..d38ec65037
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Karte anzeigen" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a116ad0bc1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach jüngsten sortieren" name="sort_most"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index 9a808088fb..c61ebb0eae 100644
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
+	<menu_item_call label="Profil anzeigen" name="show_agent"/>
+	<menu_item_call label="IM senden..." name="send_im"/>
+	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 90d3763d9c..77b7004e44 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
+	<menu_item_call label="Objektprofil..." name="show_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 8277174cda..211933a186 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status">
-			<menu_item_call label="Abwesend" name="Set Away"/>
-			<menu_item_call label="Beschäftigt" name="Set Busy"/>
-		</menu>
+		<menu label="Status" name="Status"/>
 		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
 		<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
 		<menu_item_call label="Kontoübersicht..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
+		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
-		<menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/>
-		<menu_item_check label="Voice-Morphing..." name="ShowVoice"/>
+		<menu label="Voice-Morphing" name="VoiceMorphing">
+			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
+			<menu_item_check label="Vorschau..." name="Preview"/>
+			<menu_item_call label="Abonnieren..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesten..." name="Gestures"/>
-		<menu_item_call label="Freunde" name="My Friends"/>
-		<menu_item_call label="Gruppen" name="My Groups"/>
-		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_check label="Freunde" name="My Friends"/>
+		<menu_item_check label="Gruppen" name="My Groups"/>
+		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
 	</menu>
 	<menu label="Welt" name="World">
@@ -130,6 +131,7 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
@@ -159,6 +161,13 @@
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
+		<menu_item_call label="Benutzerhandbuch" name="User’s guide"/>
+		<menu_item_call label="Knowledge Base" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Community-Foren" name="Community Forums"/>
+		<menu_item_call label="Support-Portal" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
@@ -307,7 +316,7 @@
 			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
 			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Licht und Schatten" name="Advanced Lighting Model"/>
+			<menu_item_check label="Uber Licht Modell" name="Advanced Lighting Model"/>
 			<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 4b7a60b4eb..dc0d7dc6b4 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -523,6 +523,24 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://support.amd.com/de/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=de-de
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -1558,10 +1576,13 @@ Diese Gruppe verlassen?
 		Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Beschäftigt-Modus ist aktiviert.
-Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben.
-		<usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Nicht-stören-Modus ist aktiviert:  Sie erhalten keine Benachrichtigung über eingehende Kommunikation.
+
+- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen &gt; Allgemein).
+- Teleport-Angebote werden abgelehnt.
+- Voice-Anrufe werden abgelehnt.
+		<usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab.
@@ -2049,6 +2070,10 @@ Inventarobjekt(e) verschieben?
 		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt.  Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen.
+		<usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Wirklich beenden?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
@@ -2122,14 +2147,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
 			<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
-	<notification label="Beschäftigt-Modus-Warnung" name="BusyModePay">
-		Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
+	<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
+		Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
 
-Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
+Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/>
-			<button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/>
-			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
+			<ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/>
+			<button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/>
+			<button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2264,11 +2289,8 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 	<notification name="GroupNotice">
 		Betreff: [SUBJECT], Nachricht: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
@@ -2496,13 +2518,6 @@ Fliegen ist hier nicht möglich.
 	<notification name="DynamicPathfindingDisabled">
 		Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt. Um dieses Problem zu beheben, klicken Sie auf die Schaltfläche „Region neu formen“. Um weitere Informationen zu erhalten, klicken Sie auf „Hilfe“.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Hilfe" ignoretext="Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2765,7 +2780,7 @@ Ist das OK?
 	<notification name="ScriptQuestionCaution">
 		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
   
-Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
+Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
 			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
@@ -3346,4 +3361,633 @@ Versuch abgebrochen.
 		Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen?
 		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar eingefroren.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] hat Sie aufgetaut.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar aufgetaut.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Sie sind nicht mehr eingefroren und können sich frei bewegen.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Dieser Benutzer kann nicht eingefroren werden.
+	</notification>
+	<notification name="NowOwnObject">
+		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen.
+	</notification>
+	<notification name="SitFailCantMove">
+		Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Kommen Sie näher heran.  Sitzen auf Objekt nicht möglich, da
+es sich nicht in der gleichen Region befindet wie Sie.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Neues Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Ohne ausgewählte Hauptobjekte duplizieren.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Objekte können nicht dupliziert werden, da die Region voll ist.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Objekt kann nicht erstellt werden, da 
+die Parzelle voll ist.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Versuch zum Rezzen eines Objekts fehlgeschlagen.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Dieses Inventarobjekt ist auf der schwarzen Liste.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Landsuche blockiert.
+Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt.
+Warten Sie kurz und versuchen Sie es noch einmal.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sie sind gestorben und wurden nach Hause teleportiert
+	</notification>
+	<notification name="EjectComingSoon">
+		Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Sie können diese Region nicht betreten, da 
+der Server voll ist.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Erneutes Speichern im Inventar ist deaktiviert.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		„[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann.
+	</notification>
+	<notification name="NoModNoTaking">
+		Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="RezDestInternalError">
+		Interner Fehler: Unbekannter Zielttyp.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Löschen fehlgeschlagen, da Objekt nicht gefunden wurde
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Dieser Benutzer kann nicht hinausgeworfen werden.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="HomePositionSet">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar hinausgeworfen.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Physik für Keyframe-Objekte kann nicht aktiviert werden.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden.
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt.
+	</notification>
+	<notification name="UnableAddItem">
+		Objekt konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="UnableEditItem">
+		Kein Bearbeiten möglich.
+	</notification>
+	<notification name="NoPermToEdit">
+		Bearbeiten nicht gestattet.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Kopieren dieses Inventars nicht gestattet.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
+	</notification>
+	<notification name="TooManyScripts">
+		Zu viele Skripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Skript konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Asset-Server hat nicht rechtzeitig reagiert.  Objekt wurde zum Sim zurückübertragen.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In dieser Region sind keine Physikformen aktiviert.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Sie können das Navmesh nicht regionsübergreifend modifizieren.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Hauptprim kann nicht auf formlos eingestellt werden.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In dieser Region sind keine Physikmaterialien aktiviert.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Nur bei Hauptprims können die Physikmaterialien angepasst werden.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Sie können den Nahttyp eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Sie können die Form eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Sie können diese Region nicht betreten, \nda die Region voll ist.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Verknüpfungsfehler – Eigentümer sind unterschiedlich
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Verknüpfungsfehler – zu viele Primitive
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Verknüpfungsfehler – nichts zum Verknüpfen vorhanden.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Verknüpfungsfehler – zu viele Pathfinding-Figuren
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Verknüpfungsfehler – nicht genügend Landressourcen
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert.
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sie wurden von einem Anhang an [ITEM_ID] teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Sie können hier nicht mehrere Objekte erstellen.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Objekt konnte nicht an angegebenem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Auf diesem Land können keine Pflanzen erstellt werden.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantCreateObject">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Ungültige Objektparameter
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantChangeShape">
+		Sie können diese Form nicht ändern.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Bäume und Gräser können nicht als Anhänge getragen werden.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Objekte im Gruppenbesitz können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Objekte, die Ihnen nicht gehören, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Objekte, die zum Navmesh beitragen, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Objekt kann nicht hier abgelegt werden.  Die Parzelle ist voll.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Grenzen Sie Ihre Löschparameter ein.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Asset kann nicht hochgeladen werden.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Keinen Benutzer zum Teleportieren nach Hause gefunden
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		Anforderdung nach übernatürlichen Kräften fehlgeschlagen
+	</notification>
+	<notification name="GenericRequestFailed">
+		generische Anforderdung fehlgeschlagen
+	</notification>
+	<notification name="CantUploadPostcard">
+		Postkarte kann nicht hochgeladen werden.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Inventardetails für Gruppenmitteilung kann nicht abgerufen werden.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Inventar in Mitteilung kann nicht geparst werden.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Fehler beim Hochladen von Terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Terraindatei geschrieben.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Terraindatei geschrieben, Download beginnt...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain geformt.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Sie sind nicht der autorisierte Käufer dieser Parzelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -&gt; „Fehler melden“...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Land wurde geteilt.
+	</notification>
+	<notification name="PassPurchased">
+		Sie haben einen Pass gekauft.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Region lässt keine Werbung zu.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ihr Pass für dieses Land läuft demnächst ab.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Land in Gruppenbesitz kann nicht übertragen werden.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Passkauf momentan nicht möglich.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Objekt kann nicht erstellt werden, \nda die Parzelle voll ist.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Landmarke für dieses Ereignis kann nicht erstellt werden.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Ihre übernatürlichen Kräfte heben das Einfrieren auf!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert.
+	</notification>
+	<notification name="ExpireExplanation">
+		Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung.
+	</notification>
+	<notification name="DieExplanation">
+		Das System kann Ihre Anfrage nicht verarbeiten.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Sie haben nicht genügend Geld, um Primitive zu erstellen.
+	</notification>
+	<notification name="RezObjectFailure">
+		Sie haben nicht genügend Geld, um Objekt zu erstellen.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Zuhause-Position neu festlegen, da Zuhause nicht zulässig war.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="SetHomePosition">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Angefordertes Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Angeforderter Inventarordner kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateInventory">
+		Dieses Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Landmarke kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Inventar steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantFindInvItem">
+		Inventarobjekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantFindObject">
+		Objekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Nicht ersichtlich, wer bezahlt werden muss.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Sie können öffentlichen Objekten keine L$ geben.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Inventarerstellung für Inworld-Objekt fehlgeschlagen.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden.  Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden.  Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht.
+		<usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht.
+		<usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt.
+		<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
index dcfcffa6e2..79a2ebe9df 100644
--- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/>
 	<icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/>
 	<icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index 2d140515d4..c105a5b8a3 100644
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel" width="300">
-	<text left_pad="5" name="title_text" width="260">
-		Liste der ignorierten Einwohner
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
-	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
-	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
-	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtern" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/>
+		<menu_button name="view_btn" tool_tip="Sortieroptionen"/>
+		<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
+		<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..a9bfe4754e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(laden)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..afeaa14e81
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/>
+	<icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/>
+	<button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
index d097a2b18c..fc911a64df 100644
--- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Unbekannt"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 4e76147746..8c05ca2c24 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -14,81 +14,53 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_filtered_friends_msg">
 		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche].
 	</string>
-	<string name="people_filter_label" value="Nach Leuten filtern"/>
-	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
 	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
-	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
-		<panel label="MEINE FREUNDE" name="friends_panel">
+		<panel label="FREUNDE" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEINE GRUPPEN" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Optionen"/>
-				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
-				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
+		<panel label="GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/>
+				<menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
 			</panel>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
+		<panel label="IGNORIERT" name="blocked_panel">
+			<panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index c9ae350147..8193fd42c1 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<text name="font_size">
-		Schriftgröße:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Klein" name="radio" value="0"/>
-		<radio_item label="Mittel" name="radio2" value="1"/>
-		<radio_item label="Groß" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
-	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
-	<check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
-	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IMs anzeigen in:
-	</text>
-	<text name="requires_restart_label">
-		(Neustart erforderlich)
-	</text>
-	<radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich).">
-		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
-		<radio_item label="Registerkarten" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Popups für eingehende Chats aktivieren:
-	</text>
-	<check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/>
-	<check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/>
-	<spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/>
-	<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
+		<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Schriftgröße:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Klein" name="Small" value="0"/>
+			<item label="Mittel" name="Medium" value="1"/>
+			<item label="Groß" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Benachrichtigungen
+		</text>
+		<text name="friend_ims">
+			IMs von Freunden:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IMs von anderen:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			Konferenz-IMs:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Gruppen-Chat:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat in der Nähe:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+			<item label="None" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Sound abspielen:
+		</text>
+		<check_box label="Neue Unterhaltung" name="new_conversation"/>
+		<check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
+		<check_box label="Teleport-Angebot" name="teleport_offer"/>
+		<check_box label="Inventarangebot" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Protokoll löschen..." name="clear_log"/>
+		<button label="Protokolle löschen..." name="delete_transcripts"/>
+		<button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
+	</panel>
 	<button label="Übersetzen..." name="ok_btn"/>
 	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
 	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 979ccba48d..4e453b6969 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Antwort, wenn im „Beschäftigt“-Modus:
+		Nicht-stören-Antwort:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 4c8d77d336..29239033fe 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
+			<combo_box.item label="Zoomen" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 79cb73ecf9..e142cb8029 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=de-DE&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
@@ -622,8 +622,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AvatarAway">
 		Abwesend
 	</string>
-	<string name="AvatarBusy">
-		Beschäftigt
+	<string name="AvatarDoNotDisturb">
+		Nicht stören
 	</string>
 	<string name="AvatarMuted">
 		Ignoriert
@@ -859,6 +859,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat in der Nähe
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat in der Nähe)
+	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
@@ -922,12 +928,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
-	<string name="TeleportYourAgent">
-		Sie teleportieren
-	</string>
 	<string name="NotConnected">
 		Nicht verbunden
 	</string>
+	<string name="AgentNameSubst">
+		(Sie)
+	</string>
+	<string name="TeleportYourAgent">
+		Sie teleportieren
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1009,18 +1018,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="dictionary_files">
 		Wörterbücher
 	</string>
-	<string name="AvatarSetNotAway">
-		Nicht abwesend
-	</string>
-	<string name="AvatarSetAway">
-		Abwesend
-	</string>
-	<string name="AvatarSetNotBusy">
-		Nicht beschäftigt
-	</string>
-	<string name="AvatarSetBusy">
-		Beschäftigt
-	</string>
 	<string name="shape">
 		Form
 	</string>
@@ -1989,8 +1986,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
-	<string name="BusyModeResponseDefault">
-		Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden.  Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden.
+	<string name="DoNotDisturbModeResponseDefault">
+		Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen.
 	</string>
 	<string name="MuteByName">
 		(Nach Namen)
@@ -2103,9 +2100,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Inhalte
-	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
 	</string>
@@ -3877,7 +3871,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Generelle Region
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
+		Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird.
@@ -3954,6 +3948,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="IM_unblock_only_groups_friends">
 		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
@@ -3963,6 +3963,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="you_joined_call">
 		Sie sind dem Gespräch beigetreten
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war.
+	</string>
 	<string name="name_started_call">
 		[NAME] hat einen Voice-Anruf begonnen
 	</string>
@@ -3979,7 +3982,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Wird verbunden...
 	</string>
 	<string name="conference-title">
-		Ad-hoc-Konferenz
+		Chat mit mehreren Personen
 	</string>
 	<string name="conference-title-incoming">
 		Konferenz mit [AGENT_NAME]
@@ -4859,6 +4862,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Unterhaltungen
+	</string>
 	<string name="Command_Compass_Label">
 		Kompass
 	</string>
@@ -4934,6 +4940,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Tooltip">
 		Mit Leuten in der Nähe chatten
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Mit allen unterhalten
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Kompass
 	</string>
@@ -5063,4 +5072,13 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="UserDictionary">
 		[Benutzer]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 3b56e974d2..2152a9f6e9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -70,23 +70,26 @@
      top="0"
      left="0"
      right="-1"
-     bottom="-1">
+     bottom="-3">
         <layout_stack
          animate="false" 
          default_tab_group="2"
          follows="all"
          right="-5"
          bottom="-1"
+         top="0"
+         left="5"
+         border_size="0"
          layout="topleft"
          orientation="vertical"
          name="main_stack"
-         tab_group="1"
-         top="0"
-         left="5">
+         tab_group="1">
             <layout_panel
              auto_resize="false"
              name="toolbar_panel"
-             height="35">
+             height="35"
+             right="-1"
+             left="1">
                 <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
@@ -164,7 +167,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 right="-70"
+                 right="-67"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
@@ -196,7 +199,8 @@
             </layout_panel>
             <layout_panel
              name="body_panel"
-             height="235">
+             top="1"
+             bottom="-1">
                 <layout_stack
                  default_tab_group="2"
                  follows="all"
@@ -213,12 +217,14 @@
                      min_dim="0"
                      width="150" 
                      user_resize="true"
-                     auto_resize="false" />
+                     auto_resize="false" 
+                     bottom="-1" />
                     <layout_panel
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="221">
+                     min_width="221"
+                     bottom="-1">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
@@ -262,21 +268,28 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             height="35"
+             top_delta="0"
+             top="0"
+             height="26"
+             bottom="-1"
              auto_resize="false"
              name="chat_layout_panel">
                 <layout_stack
                  animate="false"
                  default_tab_group="2"
                  follows="all"
-                 right="-1"
                  orientation="horizontal"
                  name="input_panels"
                  top="0"
-                 bottom="-1"
-                 left="0">
+                 bottom="-2"
+                 left="0"
+                 right="-1">
                     <layout_panel
-                     name="input_editor_layout_panel">
+                     name="input_editor_layout_panel"
+                     auto_resize="true"
+                     user_resize="false"
+                     top="0"
+                     bottom="-1">
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -289,27 +302,32 @@
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         bottom="-8"
-                         left="5"
-                         right="-5"
+                         top="1"
+                         bottom="-2"
+                         left="4"
+                         right="-4"
                          wrap="true" />
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
+                     user_resize="false"
                      name="input_button_layout_panel"
-                     width="32">
+                     width="30"
+                     top="0"
+                     bottom="-1">
                         <button
+                         layout="topleft"
                          left="1"
-                         top="4"
+                         right="-1"
+                         top="1"
+                         height="22"
                          follows="left|right|top"
-                         height="25"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_overlay="Conv_expand_one_line"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
                          name="minz_btn"
-                         tool_tip="Shows/hides message panel"
-                         width="28" />
+                         tool_tip="Shows/hides message panel" />
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 3b501e1ece..8b9733df17 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="615"
+ height="590"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -830,7 +830,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="435"
+     height="410"
      halign="center"
      left="0"
      name="Object Info Tabs"
@@ -1353,7 +1353,7 @@ even though the user gets a free copy.
       <panel
          border="false"
          follows="all"
-         height="592"
+         height="567"
          label="Object"
          layout="topleft"
          left_delta="0"
@@ -2110,7 +2110,7 @@ even though the user gets a free copy.
         <panel
          border="false"
          follows="all"
-         height="392"
+         height="367"
          label="Features"
          layout="topleft"
          left_delta="0"
@@ -2530,7 +2530,7 @@ even though the user gets a free copy.
              border_visible="true"
              bevel_style="in"
              follows="left|top|right"
-             height="350"
+             height="325"
              layout="topleft"
              left="10"
              name="contents_inventory"
@@ -2540,7 +2540,7 @@ even though the user gets a free copy.
         </tab_container>
 	<panel
 	 follows="left|top"
-     height="409"
+     height="384"
      layout="topleft"
      left_delta="0"
      name="land info panel"
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 b46b62ec4d..46ba4bd29d 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
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 b8128da358..28e032ce5f 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -123,6 +123,14 @@ name="Edit Outfit">
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
   <menu_item_separator
   layout="topleft" />
   <menu_item_call
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 276b5f106f..e7c2b80da2 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
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 d9bdfece38..c1ff026a74 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,12 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 101e104eab..52c4fb1613 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -180,7 +180,8 @@
        name="Set Logging Level"
        tear_off="true">
         <menu_item_check
-          label="Debug">
+         name="Debug"
+         label="Debug">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="0" />
@@ -189,7 +190,8 @@
            parameter="0" />
         </menu_item_check>
         <menu_item_check
-          label="Info">
+         name="Info"
+         label="Info">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="1" />
@@ -198,7 +200,8 @@
            parameter="1" />
         </menu_item_check>
         <menu_item_check
-          label="Warning">
+         name="Warning"
+         label="Warning">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="2" />
@@ -207,7 +210,8 @@
            parameter="2" />
         </menu_item_check>
         <menu_item_check
-          label="Error">
+         name="Error"
+         label="Error">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="3" />
@@ -216,7 +220,8 @@
            parameter="3" />
         </menu_item_check>
         <menu_item_check
-          label="None">
+         name="None"
+         label="None">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="4" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 364c1df999..2dc00e1df3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -131,6 +131,7 @@
        name="Status"
        tear_off="true">
         <menu_item_check
+         name="Away"
          label="Away">
           <menu_item_check.on_check
            function="View.Status.CheckAway" />
@@ -138,6 +139,7 @@
            function="World.SetAway" />
         </menu_item_check>
         <menu_item_check
+         name="Do Not Disturb"
          label="Do Not Disturb">
           <menu_item_check.on_check
            function="View.Status.CheckDoNotDisturb" />
@@ -2727,8 +2729,7 @@
             <menu_item_check.on_enable
                  function="Advanced.EnableRenderDeferredOptions" />
           </menu_item_check>
-
-          <menu_item_separator/>
+          <menu_item_separator />
 
           <menu_item_check
              label="Debug GL"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c2e2673fcf..b6fd14e033 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -371,7 +371,8 @@ Please try logging in again in a minute.</string>
 
 	<!-- build floater -->
 	<string name="multiple_textures">Multiple</string>
-	<string name="use_texture">Use texture</string>
+
+<string name="use_texture">Use texture</string>
 
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
@@ -2988,6 +2989,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
new file mode 100644
index 0000000000..9202fab92d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar la gente" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
new file mode 100644
index 0000000000..f579e720fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSACIÓN:">
+	<floater.string name="Title">
+		CONVERSACIÓN: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
index 1cd752e6ec..f772441141 100644
--- a/indra/newview/skins/default/xui/es/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSACIONES"/>
+<multi_floater name="floater_im_box" title="CONVERSACIONES">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
+					<button name="add_btn" tool_tip="Iniciar una conversación nueva"/>
+					<button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Cerrar este panel"/>
+					<text name="stub_textbox">
+						Esta conversación está en una ventana aparte.   [secondlife:/// Traerla de vuelta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 3d9d17fc81..5f38fbd615 100644
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/>
+	<floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/>
+	<floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/>
+	<floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<button name="add_btn" tool_tip="Añadir alguien a esta conversación"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexión de voz"/>
+				<button name="close_btn" tool_tip="Finalizar esta conversación"/>
+				<button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index b5b756abb6..acbb25b713 100644
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anónimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		está llamando.
+		te está llamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha entrado en un chat de voz en multiconferencia.
@@ -25,9 +25,9 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz?
 	</floater.string>
 	<text name="question">
-		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
+		Si respondes, te desconectarás de la conversación de voz actual.
 	</text>
-	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
-	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
-	<button label="Comenzar un MI" name="Start IM"/>
+	<button label="Responder" label_selected="Responder" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Abrir MI en su lugar" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index e93ecc9e10..3602270e5a 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostrar:
 			</text>
-			<check_box label="Mundo virtual" name="show_world"/>
+			<check_box label="Prueba" name="show_world"/>
 			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 93bc9f293c..01b024bc3e 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Vista previa inmediata" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vista previa inhabilitada"/>
 	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..1115d67239
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ">
+	<slider label="Chat de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 1a265845af..02ebe80ff7 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ">
+<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
 	<string name="no_voice_effect">
 		(Sin transformación de voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
new file mode 100644
index 0000000000..0ebc511887
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUMEN DE VOZ">
+	<slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
index ff8ad0977a..a889992b8a 100644
--- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
new file mode 100644
index 0000000000..e4e9a0bf63
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
+	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar la voz" name="block_unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+	<menu_item_call label="Perfil del grupo" name="group_profile"/>
+	<menu_item_call label="Activar el grupo" name="activate_group"/>
+	<menu_item_call label="Abandonar el grupo" name="leave_group"/>
+	<context_menu label="Opciones del moderador" name="Moderator Options">
+		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
+		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..090e6fb0bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Llamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir el historial de chat..." name="Chat history"/>
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..b8b4616b2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por fecha" name="sort_by_date"/>
+	<menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/>
+	<menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
new file mode 100644
index 0000000000..5ba0fb898e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..6ea970b826
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compacta" name="compact_view"/>
+	<menu_item_check label="Vista ampliada" name="expanded_view"/>
+	<menu_item_check label="Mostrar tiempo" name="IMShowTime"/>
+	<menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index 7e4578b950..a99c889bb0 100644
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
 	<menu_item_call label="Ignorar..." name="Block"/>
+	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
+	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 558ff6afd3..56e64c729f 100644
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
 		<menu_item_call label="Ojos nuevos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Abrir todas las carpetas" name="expand"/>
+	<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
 	<menu_item_call label="Renombrar el vestuario" name="rename"/>
 	<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml
new file mode 100644
index 0000000000..fcfeeb922b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferencias de chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversaciones..." name="Conversation"/>
+	<menu_item_check label="Traducir el chat" name="Translate_chat"/>
+	<menu_item_check label="Configuración de traducción..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..986389a4fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="No ignorar" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..10f6a3fc14
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/>
+	<menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..bc557c7ec1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
new file mode 100644
index 0000000000..ad896c1b74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
+	<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 51bd2c7208..125e25cd1a 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Llamada de voz" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
new file mode 100644
index 0000000000..c3973625b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index dc1486d879..09bb119d5a 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
-	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Ver el historial de chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index 227c5ebe58..9df160f5ad 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
-	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigos" name="add_friends"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Visita" name="call"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..c2fb360dd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
new file mode 100644
index 0000000000..f0ffd14024
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por más reciente" name="sort_most"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index a089c8f68e..69a03671ab 100644
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/>
+	<menu_item_call label="Ver el perfil" name="show_agent"/>
+	<menu_item_call label="Enviar un MI..." name="send_im"/>
+	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index 8791a290af..e78fdec558 100644
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar la información del objeto" name="show_object"/>
+	<menu_item_call label="Perfil del objeto..." name="show_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 9e0ac5115f..de42b17074 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Estado" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
-		</menu>
+		<menu label="Estado" name="Status"/>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -31,14 +28,18 @@
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
+		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
-		<menu_item_check label="Configuración de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Transformación de voz..." name="ShowVoice"/>
+		<menu label="Transformación de voz" name="VoiceMorphing">
+			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Probar..." name="Preview"/>
+			<menu_item_call label="Suscribir..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Gente cerca" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Gente cerca" name="Active Speakers"/>
 		<menu_item_call label="Lista de ignorados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 7dfb27717d..05455f54c3 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -511,6 +511,24 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos.  La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=es
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -1553,10 +1571,13 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 		En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Pasar al modo ocupado.
-Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera.
-		<usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones.
+
+- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias &gt; General).
+- Se rehusarán los ofrecimientos de teleporte.
+- Se rechazarán las llamadas de voz.
+		<usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta.
@@ -2043,6 +2064,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta?
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación.
+		<usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
@@ -2116,14 +2141,14 @@ Linden Lab
 			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
-	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
-		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
+	<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
+		Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
 
-¿Quieres salir del modo Ocupado antes de completar esta transacción?
+¿Deseas desactivar No molestar antes de finalizar esta transacción?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/>
-			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
-			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
+			<ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/>
+			<button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/>
+			<button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2258,11 +2283,8 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 	<notification name="GroupNotice">
 		Asunto: [SUBJECT], Mensaje: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está conectado
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está desconectado
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
@@ -2490,13 +2512,6 @@ Aquí no puedes volar.
 	<notification name="DynamicPathfindingDisabled">
 		Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto. Para que los objetos móviles se comporten correctamente, pulsa el botón “Recargar la región”. Si quieres más información, elige “Ayuda”.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Ayuda" ignoretext="Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2757,9 +2772,9 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
   
-Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
+No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
 		<form name="form">
 			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
@@ -3331,4 +3346,633 @@ Intento cancelado.
 		Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
 		<usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] te ha descongelado.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Error al congelar: no tienes permisos de administrador en esa parcela.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		La congelación ha terminado, puedes seguir con tus asuntos.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Lo sentimos, ese usuario no se puede congelar.
+	</notification>
+	<notification name="NowOwnObject">
+		Ahora eres el propietario del objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		El objeto no se puede colocar porque hay demasiadas solicitudes.
+	</notification>
+	<notification name="SitFailCantMove">
+		No te puedes sentar porque en este momento no puedes desplazarte.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		No te puedes sentar porque no tienes permiso para estar en ese terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Acércate. No te puedes sentar en el objeto porque
+no está en la misma región que tú.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		No se puede crear el nuevo objeto. La región está llena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		No puedes crear árboles y hierba en un terreno que no es tuyo.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Error al copiar: careces de permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Error al copiar: no se te puede transferir el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Error al copiar porque el objeto &apos;[OBJ_NAME]&apos; contribuye al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicación sin objetos raíz seleccionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		No se pueden duplicar objetos porque la región está llena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		No se puede crear el objeto porque 
+la parcela está llena.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Error al intentar colocar un objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		No se puede crear un objeto que ha causado problemas en esta región.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Ese objeto de inventario está en la lista negra.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Búsqueda de terrenos bloqueada.
+Has realizado demasiadas búsquedas de terreno con excesiva rapidez.
+Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Has muerto y te has teleportado a tu lugar de origen
+	</notification>
+	<notification name="EjectComingSoon">
+		Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		No puedes entrar en esta región porque 
+el servidor está lleno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Se ha deshabilitado Devolver el objeto a mi inventario.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque no tienes permiso para modificar el objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		No se puede guardar &apos;[OBJ_NAME]&apos; de nuevo en el inventario; esta operación está desactivada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		No se puede copiar tu selección porque no tienes permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoTransNoCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		El sistema de permisos no admite la eliminación del objeto &apos;[OBJ_NAME]&apos; del simulador.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		No se puede guardar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		No se puede guardar tu selección porque el objeto &apos;[OBJ_NAME]&apos; no se puede copiar.
+	</notification>
+	<notification name="NoModNoTaking">
+		No se puede aceptar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Error interno: tipo de destino desconocido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Error al borrar: el objeto no se encuentra
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Lo sentimos, ese usuario no se puede expulsar.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsado.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Error al expulsar: no tienes permiso de administrador en esa parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		No tienes permiso para modificar ese objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		No se puede habilitar la física para un objeto que contribuye al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		No se puede activar la física para los objetos con fotogramas clave.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		No se puede habilitar la física para el objeto: recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		¡No se puede añadir un objeto!
+	</notification>
+	<notification name="UnableEditItem">
+		¡No se puede editar esto!
+	</notification>
+	<notification name="NoPermToEdit">
+		No puedes editar esto.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		No está permitido copiar ese inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		No se puede guardar en el contenido del objeto: el objeto ya no existe.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Demasiados scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		¡No se puede añadir un script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta región no tiene habilitadas las formas de física.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		No se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		No se pueden establecer propiedades de física en ese tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		No se puede establecer que un prim raíz no tenga forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta región no tiene habilitados los materiales de física.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Solo se pueden ajustar los materiales de física de las prims raíces.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Aun no es posible configurar materiales de física para los personajes.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Una o varias de las propiedades de los materiales de física especificados no son válidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		No se puede cambiar el tipo de unión de un objeto de la malla.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		No se puede cambiar la forma de un objeto de la malla
+	</notification>
+	<notification name="FullRegionCantEnter">
+		No puedes entrar en esta región porque \nla región está llena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Error de vínculo: los propietarios son diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Error de vínculo: no se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Error de vínculo: no tienes permiso de edición.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Error de vínculo: demasiadas primitivas
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Error de vínculo: no se pueden vincular &apos;no copiable&apos; y &apos;no transferible&apos;
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Error de vínculo: no hay objetos que se puedan vincular.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Error de vínculo: demasiados personajes de pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Error de vínculo: recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Has sido teleportado al origen por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Has sido teleportado a tu origen por el objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Has sido teleportado por un anexo de [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; cuyo propietario es un usuario desconocido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		No se puede crear el objeto solicitado. La región está llena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		No puedes anexar varios objetos a un solo lugar.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Aquí no se pueden crear varios objetos.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		No se puede crear el objeto solicitado. Vuelve a intentarlo.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Error al colocar: la carga del objeto solicitado ha tardado demasiado.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		No se pueden crear plantas en este terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		No se puede restaurar el objeto. No se ha encontrado una posición del mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		No se puede colocar el objeto porque sus datos de malla no son válidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		No se puede colocar el objeto porque la región ya contiene demasiados scripts.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Tus privilegios de acceso no te permiten crear objetos allí.
+	</notification>
+	<notification name="CantCreateObject">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Los parámetros de objeto no son válidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Tus privilegios de acceso no te permiten duplicar objetos aquí.
+	</notification>
+	<notification name="CantChangeShape">
+		No tienes permiso para cambiar esta forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Tus privilegios de acceso no te permiten reclamar objetos aquí.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Error de transferencia: no tienes permiso para transferir objetos para tu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Tus privilegios de acceso no te autorizan a comprar objetos aquí.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		No se puede anexar el objeto porque un avatar está sentado en él.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		No te puedes poner árboles y hierba como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		No se pueden anexar objetos que son propiedad de grupos.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		No puedes anexar objetos de los que no eres propietario.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		No se pueden anexar objetos que contribuyen al navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		No se puede anexar el objeto porque no tienes permiso para moverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Error al soltar el anexo: no tienes permiso para soltarlo allí.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Error al soltar el anexo: recurso de terreno disponible insuficiente.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Error al soltar los anexos: los recursos disponibles son insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		No se puede soltar el objeto aquí. La parcela está llena.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Acota los parámetros de eliminación.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		No se puede subir el activo.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		No se ha podido encontrar el usuario para teleportarlo al origen
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		error en la solicitud de superpoderes
+	</notification>
+	<notification name="GenericRequestFailed">
+		error de solicitud genérico
+	</notification>
+	<notification name="CantUploadPostcard">
+		No se puede subir la postal. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		No se pueden obtener los datos de inventario del aviso de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		No se puede enviar el aviso de grupo: no está permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		No se puede enviar el aviso del grupo: el inventario no se puede construir.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		No se puede analizar el inventario del aviso.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Error al subir terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Se ha registrado el archivo de terreno.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Archivo de terreno registrado, iniciando la descarga...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno predeterminado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Para comprar esta parcela debes actualizar el visor.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Error al comprar: esta parcela no está en venta.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		No se puede comprar: el precio de venta o la superficie del terreno han cambiado.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		No eres el comprador autorizado de esta parcela.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		No puedes comprar esta parcela porque ya está en espera de una autorización de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		No se pueden construir objetos aquí porque se desbordaría la parcela.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		La selección no contiene suficientes parcelas alquiladas para unirlas.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -&gt; Notificar fallo...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		El terreno se ha dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Has comprado un pase.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		La región no permite anuncios.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Tu pase para este terreno está a punto de caducar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Esta superficie no es adecuada para sentarse, prueba en otro sitio.
+	</notification>
+	<notification name="CantSitNoRoom">
+		No hay sitio para sentarse aquí, prueba en otro lugar.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Error al reclamar el objeto: no tienes permiso
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Error al reclamar el objeto: no tienes suficientes L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		No se puede transferir un terreno propiedad de un grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Error al comprar el objeto, no tienes suficientes L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Error al comprar el inventario: no tienes suficientes L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		No tienes suficientes L$ para comprar un pase a este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		No se puede crear el objeto porque \nla parcela está llena.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		No se puede crear un hito para el evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		¡Tus superpoderes anulan la congelación!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Error en la solicitud de poderes especiales. Esta solicitud se ha registrado.
+	</notification>
+	<notification name="ExpireExplanation">
+		El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud.
+	</notification>
+	<notification name="DieExplanation">
+		El sistema no puede procesar tu solicitud.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Dinero insuficiente para crear la primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Dinero insuficiente para crear el objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Se ha restaurado la posición de origen, puesto que dicha posición no era válida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		No se puede quitar el objeto por un error del inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		No se puede crear el inventario solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		No se puede crear la carpeta de inventario solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		No se puede crear el inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		No se puede crear un hito.
+	</notification>
+	<notification name="CantCreateOutfit">
+		No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		El inventario no está en venta.
+	</notification>
+	<notification name="CantFindInvItem">
+		No se encuentra el objeto del inventario.
+	</notification>
+	<notification name="CantFindObject">
+		No se puede encontrar el objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		En esta región actualmente no están activadas las transferencias de dinero a los objetos.
+	</notification>
+	<notification name="CantPayNoAgent">
+		No se ha averiguado a quién se debe pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		No se pueden dar L$ a los objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Error al crear un inventario de objeto del mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo.
+		<usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup.
+		<usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		No se pueden mover los archivos. Ruta anterior restaurada.
+		<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
index 5220df5d21..c73e34b299 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index cddbad1195..a3de14ae67 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de ignorados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
-	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
-	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
-	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/>
+		<menu_button name="view_btn" tool_tip="Opciones de clasificación"/>
+		<menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/>
+		<button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..cc4a7e951d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(cargando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..2fc8cd3aff
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversación incluía voz"/>
+	<icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/>
+	<button name="delete_btn" tool_tip="Quitar esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
index 5c9f1c3688..4d682068d7 100644
--- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconocido"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index a9d38dca25..7a7dfca0b8 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar].
 	</string>
-	<string name="people_filter_label" value="Filtrar a la gente"/>
-	<string name="groups_filter_label" value="Filtrar a los grupos"/>
 	<string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/>
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
-	<filter_editor label="Filtrar" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="MIS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MIS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opciones"/>
-				<button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
-				<button name="activate_btn" tool_tip="Activar el grupo seleccionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar los grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
+				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
 			</panel>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADO" name="blocked_panel">
+			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index b0b6114e88..28bc98f988 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<text name="font_size">
-		Tamaño de la fuente:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Disminuir" name="radio" value="0"/>
-		<radio_item label="Medio" name="radio2" value="1"/>
-		<radio_item label="Aumentar" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
-	<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
-	<check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/>
-	<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar los MI en:
-	</text>
-	<text name="requires_restart_label">
-		(requiere reiniciar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
-		<radio_item label="Ventanas distintas" name="radio" value="0"/>
-		<radio_item label="Pestañas" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Permitir ventanas de chat emergentes:
-	</text>
-	<check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/>
-	<check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/>
-	<spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/>
-	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
+		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamaño de la fuente:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeña" name="Small" value="0"/>
+			<item label="Mediana" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notificaciones
+		</text>
+		<text name="friend_ims">
+			MI de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			MI de no amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="conference_ims">
+			MI de conferencia:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Ninguno" name="None" value="ninguno"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Para suspender provisionalmente todas las notificaciones, usa Comunicarme &gt; No molestar.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Reproducir sonido:
+		</text>
+		<check_box label="Nueva conversación" name="new_conversation"/>
+		<check_box label="Llamada de voz entrante" name="incoming_voice_call"/>
+		<check_box label="Oferta de teleporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventario" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Limpiar el registro..." name="clear_log"/>
+		<button label="Eliminar transcripciones..." name="delete_transcripts"/>
+		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
+	</panel>
 	<button label="Traducción…" name="ok_btn"/>
 	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
 	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 4fc163f5b6..98b0081da9 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta cuando estoy en modo ocupado:
+		Respuesta de No molestar:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index 9da2958953..cb061796e7 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar el objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 52bcab54e5..937433e210 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
@@ -610,8 +610,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AvatarAway">
 		Ausente
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		No molestar
 	</string>
 	<string name="AvatarMuted">
 		Ignorado
@@ -844,6 +844,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ST_NO_JOINT">
 		No se puede encontrar ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat)
+	</string>
 	<string name="whisper">
 		susurra:
 	</string>
@@ -907,6 +913,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
+	<string name="AgentNameSubst">
+		(Tú)
+	</string>
 	<string name="TeleportYourAgent">
 		Teleportarte
 	</string>
@@ -991,18 +1000,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="dictionary_files">
 		Diccionarios
 	</string>
-	<string name="AvatarSetNotAway">
-		Salir del estado ausente
-	</string>
-	<string name="AvatarSetAway">
-		Pasar al estado ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Salir del estado ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Pasar al estado ocupado
-	</string>
 	<string name="shape">
 		Forma
 	</string>
@@ -1959,8 +1956,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="PanelContentsNewScript">
 		Script nuevo
 	</string>
-	<string name="BusyModeResponseDefault">
-		El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente tiene activado &apos;No molestar&apos; y verá tu mensaje más tarde.
 	</string>
 	<string name="MuteByName">
 		(Por el nombre)
@@ -2073,9 +2070,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenidos
-	</string>
 	<string name="AcquiredItems">
 		Artículos adquiridos
 	</string>
@@ -3793,7 +3787,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Región General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Los avatares están visibles y está permitido el chat fuera de esta parcela
+		Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue.
@@ -3867,6 +3861,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Saved_message">
 		(Guardado [LONG_TIMESTAMP])
 	</string>
+	<string name="OnlineStatus">
+		Conectado/a
+	</string>
+	<string name="OfflineStatus">
+		Desconectado/a
+	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
@@ -3876,6 +3876,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Has entrado en la llamada de voz
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Rechazaste la llamada de voz automáticamente porque estaba activado &apos;No molestar&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] inició una llamada de voz
 	</string>
@@ -3888,6 +3891,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Se colgó la llamada de voz
 	</string>
+	<string name="conference-title">
+		Chat multi-persona
+	</string>
 	<string name="conference-title-incoming">
 		Conferencia con [AGENT_NAME]
 	</string>
@@ -4766,6 +4772,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversaciones
+	</string>
 	<string name="Command_Compass_Label">
 		Brújula
 	</string>
@@ -4841,6 +4850,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Tooltip">
 		Habla por chat de texto con las personas próximas
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar con todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Brújula
 	</string>
@@ -4970,4 +4982,13 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="UserDictionary">
 		[Usuario]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
new file mode 100644
index 0000000000..e9017c79b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..9a486a84c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSATION:">
+	<floater.string name="Title">
+		CONVERSATION: [NAME]
+	</floater.string>
+	<text name="page_label" value="Page"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
index 5ea073365e..f0b17e8437 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
+<multi_floater name="floater_im_box" title="CONVERSATIONS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
+					<button name="add_btn" tool_tip="Commencer une nouvelle conversation"/>
+					<button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/>
+					<text name="stub_textbox">
+						Cette conversation s&apos;affiche dans une fenêtre distincte.   [secondlife:/// la rattacher.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 516eb41362..8ab98b8e4e 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="À" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] a été invité à la conversation."/>
+	<floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/>
+	<floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/>
+	<floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/>
+	<floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/>
+	<floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/>
+				<button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/>
+				<button name="close_btn" tool_tip="Mettre fin à cette conversation"/>
+				<button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="À" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
index 7594eec5f2..9e6946ba9e 100644
--- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonyme
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		appelle.
+		vous appelle.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		a rejoint un chat vocal avec conférence.
@@ -25,9 +25,9 @@
 		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</floater.string>
 	<text name="question">
-		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
+		Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle.
 	</text>
-	<button label="Accepter" label_selected="Accepter" name="Accept"/>
-	<button label="Refuser" label_selected="Refuser" name="Reject"/>
-	<button label="Lancer IM" name="Start IM"/>
+	<button label="Répondre" label_selected="Répondre" name="Accept"/>
+	<button label="Ignorer" label_selected="Ignorer" name="Reject"/>
+	<button label="Ouvrir IM à la place" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 02d969dc08..0bcf55aba5 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Afficher :
 			</text>
-			<check_box label="Monde" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
 			<check_box label="Maillage de navigation" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index f86c1a4217..eace67026c 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..f4f452eea7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL">
+	<slider label="Chat vocal" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index 671fb5c14d..f9a76d127e 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX">
+<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
 	<string name="no_voice_effect">
 		(Aucun effet de voix)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
new file mode 100644
index 0000000000..bf91a5bb79
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE LA VOIX">
+	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
index 8276d57025..fea0486d8a 100644
--- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/>
-	<menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
new file mode 100644
index 0000000000..857ead603b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
+	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
+	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Supprimer ces amis" name="remove_friends"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="block_unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+	<menu_item_call label="Profil du groupe" name="group_profile"/>
+	<menu_item_call label="Activer le groupe" name="activate_group"/>
+	<menu_item_call label="Quitter le groupe" name="leave_group"/>
+	<context_menu label="Options du modérateur" name="Moderator Options">
+		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
+		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/>
+		<menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..4e7e84199d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Appel..." name="Call"/>
+	<menu_item_call label="Ouvrir l&apos;historique du chat..." name="Chat history"/>
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Téléporter" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="Invite"/>
+	<menu_item_call label="Carte" name="Map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..c515a8e8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par date" name="sort_by_date"/>
+	<menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/>
+	<menu_item_call label="Afficher l&apos;historique du Chat près de moi" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
new file mode 100644
index 0000000000..1ec5910c8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..03a091d1cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vue compacte" name="compact_view"/>
+	<menu_item_check label="Vue développée" name="expanded_view"/>
+	<menu_item_check label="Afficher l’heure" name="IMShowTime"/>
+	<menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 69f8e88a0d..7c94930160 100644
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
 	<menu_item_call label="Ignorer..." name="Block"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Me téléporter à l’emplacement de l&apos;objet" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index b5181f4f82..21b19eded6 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Développer tous les dossiers" name="expand"/>
+	<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
new file mode 100644
index 0000000000..1811082c84
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/>
+	<menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/>
+	<menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/>
+	<menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Préférences pour le chat..." name="chat_preferences"/>
+	<menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/>
+	<menu_item_check label="Journal des conversations..." name="Conversation"/>
+	<menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/>
+	<menu_item_check label="Paramètres de traduction" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..47589572c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Ne plus ignorer" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..79880dd16d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
+	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..13f1575090
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par type" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..cc81172462
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par statut" name="sort_status"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
+	<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
index eb51b4cf7e..8e32f065fa 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Afficher les infos" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Appel" name="Call"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Quitter" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..79ede5e22d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 26bd3978a9..6f7d02ef74 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Devenir amis" name="Add Friend"/>
-	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Carte" name="Map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Afficher l&apos;historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
index 8400ec0a14..37abf831c2 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Devenir amis" name="Add Friends"/>
-	<menu_item_call label="Supprimer des amis" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friends"/>
+	<menu_item_call label="Supprimer des amis" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Appeler" name="call"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..086002dce5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par distance" name="sort_distance"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher la carte" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a7d698ab7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index 5ed627fbc3..d701b3a414 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
+	<menu_item_call label="Voir le profil" name="show_agent"/>
+	<menu_item_call label="Envoyer IM..." name="send_im"/>
+	<menu_item_call label="Devenir amis..." name="add_friend"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index f581c3ef9d..0a934d3e69 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
+	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 24bd6a2a95..49122a0f6d 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Statut" name="Status">
-			<menu_item_call label="Absent" name="Set Away"/>
-			<menu_item_call label="Occupé" name="Set Busy"/>
-		</menu>
+		<menu label="Statut" name="Status"/>
 		<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="Page d&apos;accueil du compte..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversations..." name="Conversations"/>
+		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
-		<menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/>
-		<menu_item_check label="Effet de voix..." name="ShowVoice"/>
+		<menu label="Effet de voix" name="VoiceMorphing">
+			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
+			<menu_item_check label="Aperçu..." name="Preview"/>
+			<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestes..." name="Gestures"/>
-		<menu_item_call label="Amis" name="My Friends"/>
-		<menu_item_call label="Groupes" name="My Groups"/>
-		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_check label="Amis" name="My Friends"/>
+		<menu_item_check label="Groupes" name="My Groups"/>
+		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
 		<menu_item_call label="Liste des ignorés" name="Block List"/>
 	</menu>
 	<menu label="Monde" name="World">
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 30154d1873..e73cc6e6e0 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -515,6 +515,24 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=fr
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -1543,10 +1561,13 @@ Quitter le groupe ?
 		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Le mode Occupé est sélectionné.
-Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
-		<usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Ne pas déranger est activé.  Vous ne recevrez pas les notifications de communications entrantes.
+
+- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences &gt; Général).
+- Toutes les offres de téléportation seront refusées.
+- Les appels vocaux seront refusés.
+		<usetemplate ignoretext="J&apos;ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
@@ -2033,6 +2054,10 @@ Déplacer les objets de l&apos;inventaire ?
 		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée.  Tous les participants recevront les notifications de nouvelle conversation.
+		<usetemplate ignoretext="Confirmer l&apos;ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Êtes-vous certain de vouloir quitter ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2107,14 +2132,14 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
 	</notification>
-	<notification label="Réponse si occupé(e)" name="BusyModePay">
-		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
+	<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
+		Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
 
-Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
+Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/>
-			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
+			<ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/>
+			<button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 	<notification name="GroupNotice">
 		Sujet : [SUBJECT], Message : [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est en ligne
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est hors ligne
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
@@ -2482,13 +2504,6 @@ Vous ne pouvez pas voler ici.
 	<notification name="DynamicPathfindingDisabled">
 		La recherche de chemin dynamique n&apos;est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles. Pour que les objets mobiles se comportent correctement, cliquez sur Refiger la région. Pour plus d&apos;informations, choisissez Aide.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Aide" ignoretext="La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Une erreur est survenue. Un problème réseau ou serveur s&apos;est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2766,7 @@ Acceptez-vous ?
 	<notification name="ScriptQuestionCaution">
 		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
   
-Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
+N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
 			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
@@ -3332,4 +3347,633 @@ Désactivation des mises à jour futures de ce fichier...
 		Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
 		<usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar figé.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] vous a libéré.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar libéré.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Vous n&apos;avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Vous n&apos;êtes plus figé, vous pouvez reprendre votre vie.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Impossible de figer cet utilisateur.
+	</notification>
+	<notification name="NowOwnObject">
+		Vous êtes désormais le propriétaire de l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="CantRezOnLand">
+		Impossible de rezzer l&apos;objet à [OBJECT_POS] car le propriétaire de ce terrain de l&apos;autorise pas.  Utilisez l&apos;outil Terrain pour voir à qui appartiennent les terrains.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Impossible de rezzer l&apos;objet car il y a trop de demandes.
+	</notification>
+	<notification name="SitFailCantMove">
+		Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n&apos;est pas autorisée.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Essayez de vous rapprocher.  Impossible de vous asseoir sur l&apos;objet car
+il ne se trouve pas dans la même région que vous.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Création d&apos;un nouvel objet impossible. La région est pleine.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Vous ne pouvez pas créer d&apos;arbres ni d&apos;herbe sur un terrain qui ne vous appartient pas.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Échec de la copie car vous ne disposez pas des droits requis pour copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Échec de la copie car l&apos;objet [OBJ_NAME] ne peut pas vous être transféré.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Échec de la copie car l&apos;objet [OBJ_NAME] contribue au maillage de navigation.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Dupliquer sans objet racine sélectionné
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossible de dupliquer les objets car la région est pleine.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Création de l&apos;objet impossible car 
+la parcelle est pleine.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Échec d&apos;une tentative pour rezzer un objet.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossible de créer l&apos;article qui a provoqué des problèmes pour cette région.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Cet article d&apos;inventaire a été placé sur liste noire.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Recherche de terrain bloquée.
+Vous avez effectué trop de recherches de terrain trop rapidement.
+Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Vous êtes mort et avez été téléporté à votre domicile.
+	</notification>
+	<notification name="EjectComingSoon">
+		Votre présence ici n&apos;est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Vous ne pouvez pas pénétrer dans cette région car 
+le serveur est plein.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Le réenregistrement dans l&apos;inventaire a été désactivé.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car l&apos;objet à partir duquel il a été rezzé n&apos;existe plus.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l&apos;objet [DEST_NAME].
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossible de réenregistrer [OBJ_NAME] dans l&apos;inventaire -- cette opération a été désactivée.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car vous n&apos;avez pas le droit de copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La suppression de l&apos;objet [OBJ_NAME] du simulateur n&apos;est pas autorisée par le système de droits.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car l&apos;objet [OBJ_NAME] ne peut pas être copié.
+	</notification>
+	<notification name="NoModNoTaking">
+		Vous ne pouvez pas prendre votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="RezDestInternalError">
+		Erreur interne : type de destination inconnue.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Échec de la suppression car l&apos;objet est introuvable
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Exclusion de cet utilisateur impossible.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="HomePositionSet">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsé.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Vous n&apos;avez pas pu réaliser l&apos;exclusion car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car il n&apos;y a pas suffisamment de ressources pour cet objet sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car l&apos;autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Vous n&apos;êtes pas autorisé à modifier cet objet.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Impossible d&apos;activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec images-clés.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossible d&apos;activer les propriétés physiques pour l&apos;objet -- ressources de terrain insuffisantes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Cet objet ne peut pas contenir de morceau concave car c&apos;est un fantôme qui contribue au maillage de navigation.
+	</notification>
+	<notification name="UnableAddItem">
+		Ajout de l&apos;article impossible.
+	</notification>
+	<notification name="UnableEditItem">
+		Modification impossible
+	</notification>
+	<notification name="NoPermToEdit">
+		Modification interdite.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Pas autorisé à copier cet inventaire.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossible d&apos;enregistrer dans le contenu des objets : L&apos;article n&apos;existe plus.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossible d&apos;enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l&apos;inventaire.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossible d&apos;enregistrer dans le contenu des objets : cela modifierait les droits d&apos;attache.
+	</notification>
+	<notification name="TooManyScripts">
+		Trop de scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Ajout du script impossible.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Le serveur d&apos;actifs n&apos;a pas répondu assez vite.  Objet renvoyé dans le sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Les formes physiques ne sont pas activées pour cette région.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossible de définir les propriétés physiques pour ce type d&apos;objet.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Vous devenez définir une forme pour la prim racine.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Les matériaux physiques ne sont pas activés pour cette région.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Les matériaux physiques ne peuvent être ajustés que pour les prims racines.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		La configuration de matériaux physiques sur les personnages n&apos;est pas prise en charge actuellement.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Une ou plusieurs propriétés des ressources physiques spécifiées n&apos;étaient pas valides.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Vous ne pouvez pas changer le type de raccord d&apos;un objet avec maillage.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Vous ne pouvez pas changer la forme d&apos;un objet avec maillage.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Échec du lien -- les propriétaires sont différents
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Échec du lien car vous ne disposez pas des droits de modification.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Échec du lien -- trop de primitives
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Échec du lien -- impossible de lier pas de copie et pas de transfert
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Échec du lien - il n&apos;y a rien qui puisse être lié.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Échec du lien -- trop de personnages de recherche de chemin
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Échec du lien -- ressources de terrain insuffisantes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Vous avez été téléporté par un élément sur [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Création de l&apos;objet demandé impossible. La région est pleine.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Vous ne pouvez pas attacher plusieurs objets au même endroit.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Vous ne pouvez pas créer plusieurs objets ici.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Création de l&apos;objet demandé impossible. Objet absent de la base de données.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Création de l&apos;objet demandé impossible. Délai d&apos;attente dépassé. Veuillez réessayer.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Création de l&apos;objet demandé impossible. Veuillez réessayer.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Échec de l&apos;action « rezzer », le chargement de l&apos;objet demandé a pris trop longtemps.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Vous ne pouvez pas créer de plantes sur ce terrain.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossible de restaurer l&apos;objet. Position dans le monde introuvable.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossible de rezzer l&apos;objet car ses données de maillage ne sont pas valides.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossible de rezzer l&apos;objet car il y a déjà trop de scripts dans cette région.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à créer des objets à cet endroit.
+	</notification>
+	<notification name="CantCreateObject">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Paramètres d&apos;objet non valides
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à dupliquer des objets ici.
+	</notification>
+	<notification name="CantChangeShape">
+		Vous n’êtes pas autorisé à modifier cette forme.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Vos privilèges d&apos;accès ne vous autorisent pas à revendiquer des objets ici.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Vos privilèges d&apos;accès ne vous autorisent pas à acheter des objets ici.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossible d&apos;attacher l&apos;objet car un avatar est assis dessus.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Les arbres et les plantes ne peuvent pas être portés sous forme d&apos;éléments attachés.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossible d&apos;attacher les objets appartenant au groupe.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossible d&apos;attacher les objets contribuant au maillage de navigation.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Impossible d&apos;attacher l&apos;objet car vous n&apos;avez pas le droit de le déplacer.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</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>
+	<notification name="CantDropMeshAttachment">
+		Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l&apos;inventaire puis rezzez-les dans le monde.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		L&apos;élément n&apos;a pas pu être déposé : vous n&apos;avez pas le droit de déposer des éléments à cet endroit.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		L&apos;élément n&apos;a pas pu être déposé : ressources de terrain disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Les éléments n&apos;ont pas pu être déposés : ressources disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Impossible de déposer l&apos;objet ici.  La parcelle est pleine.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Veuillez affiner vos paramètres de suppression.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Chargement de l&apos;actif impossible.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Impossible de trouver l&apos;utilisateur à téléporter chez lui
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		échec de la demande de type divine
+	</notification>
+	<notification name="GenericRequestFailed">
+		échec de la demande générique
+	</notification>
+	<notification name="CantUploadPostcard">
+		Chargement de la carte postale impossible.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Impossible récupérer les détails de l&apos;inventaire pour la notice au groupe.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossible d&apos;envoyer une notice au groupe -- ce n&apos;est pas autorisé.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossible d&apos;envoyer une notice au groupe - échec de la construction de l&apos;inventaire.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossible d&apos;analyser l&apos;inventaire dans la notice.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Échec du chargement du terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Fichier de terrain écrit
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Fichier de terrain écrit, lancement du téléchargement...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain figé.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Vous devez mettre votre client à jour pour acheter cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Achat impossible, cette parcelle n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Achat impossible, le prix de vente ou la zone de terrain a changé.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Vous n&apos;êtes pas un acheteur autorisé pour cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d&apos;une autorisation d&apos;achat.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Vous ne pouvez pas construire d&apos;objets ici car cela saturerait la parcelle.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -&gt; Signaler un bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Le terrain a été divisé.
+	</notification>
+	<notification name="PassPurchased">
+		Vous avez acheté un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Cette région n&apos;autorise pas les petites annonces.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Votre pass pour ce terrain arrive à expiration.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Il n&apos;y a pas de surface appropriée sur laquelle s&apos;asseoir, essayez un autre endroit.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Pas de place pour s&apos;asseoir ici, essayez un autre endroit.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas des droits requis.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Impossible de céder un terrain appartenant au groupe.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Échec de l&apos;achat de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Échec de l&apos;achat d&apos;inventaire car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Impossible d&apos;acheter le pass actuellement.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Création de l&apos;objet impossible car \nla parcelle est pleine.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossible de créer le repère pour l&apos;événement.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Grâce à vos pouvoirs de type divin, vous n&apos;êtes plus figé.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée.
+	</notification>
+	<notification name="ExpireExplanation">
+		Le système ne peut pas traiter votre demande actuellement. Délai d&apos;attente dépassé.
+	</notification>
+	<notification name="DieExplanation">
+		Le système ne peut pas traiter votre demande.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fonds insuffisants pour créer la primitive.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fonds insuffisants pour créer l&apos;objet.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Réinitialiser l&apos;emplacement du domicile car il n&apos;était pas légal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="SetHomePosition">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossible de dérezzer l&apos;objet à cause d&apos;un défaut d&apos;inventaire.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Création de l&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Création du dossier d&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateInventory">
+		Création de cet inventaire impossible.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Création du repère impossible.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Création de la tenue impossible. Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventaire n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantFindInvItem">
+		Objet de l&apos;inventaire introuvable.
+	</notification>
+	<notification name="CantFindObject">
+		Objet introuvable.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Les transferts d&apos;argent aux objets sont actuellement désactivés dans cette région.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Impossible de savoir qui payer.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Vous ne pouvez pas donner de L$ à des objets publics.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Échec de la création d&apos;inventaire sur l&apos;objet Second Life.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Une erreur interne nous a empêchés de mettre votre client à jour correctement.  Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Impossible de créer de grandes prims qui coupent d&apos;autres joueurs.  Réessayez une fois que les autres joueurs se seront déplacés.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier.
+		<usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés.
+		<usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossible de déplacer les fichiers. Chemin précédent rétabli.
+		<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
index 54b8f53e59..c8fa9f340f 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/>
 	<icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/>
 	<icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
index 96add2a74b..0e2b5a9c93 100644
--- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Liste des ignorés
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
-	<button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
-	<button label="Ignorer un objet par son nom" label_selected="Ignorer un objet par son nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
-	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrer" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l&apos;objet sélectionné"/>
+		<menu_button name="view_btn" tool_tip="Options de tri"/>
+		<menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/>
+		<button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ebf18f6483
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(chargement)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..9c277842b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/>
+	<icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/>
+	<button name="delete_btn" tool_tip="Supprimer cette entrée"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
index 5fb69d1989..b1b32af7c6 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Inconnu"/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f035853efc..227ce26df7 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -14,81 +14,53 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_filtered_friends_msg">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher].
 	</string>
-	<string name="people_filter_label" value="Filtrer les personnes"/>
-	<string name="groups_filter_label" value="Filtrer les groupes"/>
 	<string name="no_filtered_groups_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/>
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
-	<filter_editor label="Filtre" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="nearby_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
-		<panel label="MES AMIS" name="friends_panel">
+		<panel label="AMIS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="friends_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Afficher d&apos;autres options"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis."/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MES GROUPES" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
-				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
-				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
+		<panel label="GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrer les groupes" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/>
+				<menu_button name="groups_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
 			</panel>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="recent_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUÉ" name="blocked_panel">
+			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 550beb653e..972190dc15 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<text name="font_size">
-		Taille de la police :
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Petite" name="radio" value="0"/>
-		<radio_item label="Moyenne" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
-	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
-	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
-	<check_box label="Bulles de chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Afficher les IM dans :
-	</text>
-	<text name="requires_restart_label">
-		(redémarrage requis)
-	</text>
-	<radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)">
-		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
-		<radio_item label="Onglets" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Activer les popups de chat entrant :
-	</text>
-	<check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message de chat de groupe."/>
-	<check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message instantané."/>
-	<spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/>
-	<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Taille de la police :
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Petite" name="Small" value="0"/>
+			<item label="Moyenne" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notifications
+		</text>
+		<text name="friend_ims">
+			IM amis :
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM non amis :
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM conférence :
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat de groupe :
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat près de moi :
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="clignote"/>
+			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Écouter le son :
+		</text>
+		<check_box label="Nouvelle conversation" name="new_conversation"/>
+		<check_box label="Appel entrant" name="incoming_voice_call"/>
+		<check_box label="Offre de téléportation" name="teleport_offer"/>
+		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Effacer le journal..." name="clear_log"/>
+		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
+		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
+	</panel>
 	<button label="Traduction..." name="ok_btn"/>
 	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
 	<button label="Orthographe..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 66b84af3aa..533c392d6b 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="Jamais" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Réponse si occupé(e) :
+		Réponse Ne pas déranger
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index 60027d41cb..896dd932e3 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 			<combo_box.item label="Ouvrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 6a2a3f559a..69ed20f376 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=fr-FR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
@@ -622,8 +622,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AvatarAway">
 		Absent
 	</string>
-	<string name="AvatarBusy">
-		Occupé
+	<string name="AvatarDoNotDisturb">
+		Ne pas déranger
 	</string>
 	<string name="AvatarMuted">
 		Bloqué(e)
@@ -859,6 +859,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ST_NO_JOINT">
 		Impossible de trouver ROOT ou JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat près de moi
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat près de moi)
+	</string>
 	<string name="whisper">
 		chuchote :
 	</string>
@@ -922,12 +928,15 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
-	<string name="TeleportYourAgent">
-		Vous téléporter
-	</string>
 	<string name="NotConnected">
 		Pas connecté(e)
 	</string>
+	<string name="AgentNameSubst">
+		(Vous)
+	</string>
+	<string name="TeleportYourAgent">
+		Vous téléporter
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1009,18 +1018,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="dictionary_files">
 		Dictionnaires
 	</string>
-	<string name="AvatarSetNotAway">
-		Présent
-	</string>
-	<string name="AvatarSetAway">
-		Absent
-	</string>
-	<string name="AvatarSetNotBusy">
-		Pas occupé
-	</string>
-	<string name="AvatarSetBusy">
-		Occupé
-	</string>
 	<string name="shape">
 		Silhouette
 	</string>
@@ -1989,8 +1986,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
+	<string name="DoNotDisturbModeResponseDefault">
+		Ce résident a activé Ne pas déranger et verra votre message plus tard.
 	</string>
 	<string name="MuteByName">
 		(par nom)
@@ -2103,9 +2100,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenus
-	</string>
 	<string name="AcquiredItems">
 		Objets acquis
 	</string>
@@ -3877,7 +3871,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Région de type Général
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatars visibles et chat autorisé en dehors de cette parcelle
+		Les avatars à l&apos;extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l&apos;intérieur.
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu&apos;elle n&apos;est pas refigée.
@@ -3954,6 +3948,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM, sous Préférences/Confidentialité.
 	</string>
+	<string name="OnlineStatus">
+		En ligne
+	</string>
+	<string name="OfflineStatus">
+		Hors ligne
+	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
@@ -3963,6 +3963,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Vous avez rejoint l&apos;appel
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Vous avez automatiquement refusé l&apos;appel vocal quand le mode Ne pas déranger était activé.
+	</string>
 	<string name="name_started_call">
 		[NAME] appelle.
 	</string>
@@ -3979,7 +3982,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Connexion en cours...
 	</string>
 	<string name="conference-title">
-		Conférence ad-hoc
+		Chat à plusieurs
 	</string>
 	<string name="conference-title-incoming">
 		Conférence avec [AGENT_NAME]
@@ -4859,6 +4862,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversations
+	</string>
 	<string name="Command_Compass_Label">
 		Boussole
 	</string>
@@ -4934,6 +4940,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Tooltip">
 		Parler aux personnes près de vous par chat écrit
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Parler à quelqu&apos;un
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Boussole
 	</string>
@@ -5063,4 +5072,13 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
new file mode 100644
index 0000000000..8354824ed1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtro persone" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
new file mode 100644
index 0000000000..d0e9c8ee0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSAZIONE:">
+	<floater.string name="Title">
+		CONVERSAZIONE: [NAME]
+	</floater.string>
+	<text name="page_label" value="Pagina"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
index fb8e77b32f..10cf1b7f7e 100644
--- a/indra/newview/skins/default/xui/it/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAZIONI"/>
+<multi_floater name="floater_im_box" title="CONVERSAZIONI">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/>
+					<button name="add_btn" tool_tip="Avvia una nuova conversazione"/>
+					<button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/>
+					<text name="stub_textbox">
+						Questa conversazione in una finestra separata.   [secondlife:/// Ripristina conversazione.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index 3d9d17fc81..d38ec7a5fe 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/>
+	<floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/>
+	<floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/>
+	<floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/>
+	<floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l&apos;elenco dei partecipanti"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/>
+				<button name="voice_call_btn" tool_tip="Apri collegamento voce"/>
+				<button name="close_btn" tool_tip="Termina questa conversazione"/>
+				<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduci chat" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index a95ed44662..566920209d 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		sta chiamando.
+		ti sta chiamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha aderito ad una chiamata in chat vocale in conferenza.
@@ -25,9 +25,9 @@
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
-		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
+		Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente.
 	</text>
-	<button label="Accetta" label_selected="Accetta" name="Accept"/>
-	<button label="Rifiuta" label_selected="Rifiuta" name="Reject"/>
-	<button label="Inizia IM" name="Start IM"/>
+	<button label="Risposta" label_selected="Risposta" name="Accept"/>
+	<button label="Ignora" label_selected="Ignora" name="Reject"/>
+	<button label="Apri invece IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 77be220a2a..7777444161 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostra:
 			</text>
-			<check_box label="Mondo" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index c97a91bb3f..27a17868a7 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Default" label_selected="Default" name="Default"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
 	<button label="Niente" label_selected="Niente" name="None"/>
-	<check_box initial_value="true" label="Anteprima dal vivo" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Anteprima disattivata"/>
 	<filter_editor label="Filtro texture" name="inventory search editor"/>
 	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..b168d067c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE">
+	<slider label="Chat vocale" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index c83b11f698..f102622f5d 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE">
+<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
 	<string name="no_voice_effect">
 		(Nessuna manipolazione voce)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
new file mode 100644
index 0000000000..eaeda7597f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME VOCE">
+	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
index 10524ba92d..984e4a1611 100644
--- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
new file mode 100644
index 0000000000..46ced93f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
+	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
+	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca voce" name="block_unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+	<menu_item_call label="Profilo del gruppo" name="group_profile"/>
+	<menu_item_call label="Attiva gruppo" name="activate_group"/>
+	<menu_item_call label="Lascia il gruppo" name="leave_group"/>
+	<context_menu label="Opzioni moderatore" name="Moderator Options">
+		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
+		<menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
+		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..5686a902eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Chiamata a voce..." name="Call"/>
+	<menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/>
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="Invite"/>
+	<menu_item_call label="Mappa" name="Map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..73b05831ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
+	<menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/>
+	<menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
new file mode 100644
index 0000000000..1621d57e12
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Aggiungi come amico" name="Add Friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca voce" name="Block/Unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..350fbc5c6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compatta" name="compact_view"/>
+	<menu_item_check label="Vista espansa" name="expanded_view"/>
+	<menu_item_check label="Mostra orario" name="IMShowTime"/>
+	<menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 0f347b1a90..9623775af4 100644
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
 	<menu_item_call label="Blocca..." name="Block"/>
+	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
+	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 09fc867d7c..3ac0c5ce69 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nuovi capelli" name="New Hair"/>
 		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Apri tutte le cartelle" name="expand"/>
+	<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml
new file mode 100644
index 0000000000..c87cda57bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferenze chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferenze privacy..." name="privacy_preferences"/>
+	<menu_item_check label="Registro conversazioni..." name="Conversation"/>
+	<menu_item_check label="Traduci chat vicina" name="Translate_chat"/>
+	<menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..e9955923b2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Sblocca" name="unblock"/>
+	<menu_item_call label="Profilo..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..cbcf084b86
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..fc80c73ae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base al tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
new file mode 100644
index 0000000000..972e359cfe
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
+	<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
index 30a97a1c72..8ca7537ee0 100644
--- a/indra/newview/skins/default/xui/it/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Mostra informazioni" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Chiamata a voce" name="Call"/>
 	<menu_item_call label="Attiva" name="Activate"/>
 	<menu_item_call label="Chiudi" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
new file mode 100644
index 0000000000..56b9abbd3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index a974bd181d..1c09b1cfe2 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Aggiungi amico" name="Add Friend"/>
-	<menu_item_call label="Rimuovi amico" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Mappa" name="Map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
index e0b9ceb63d..b9ce70167f 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Aggiungi amici" name="Add Friends"/>
-	<menu_item_call label="Rimuovi amici" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi amici" name="add_friends"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Chiama" name="call"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..223d88fee1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra mappa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
new file mode 100644
index 0000000000..fc6213bd08
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index 37755d5749..abfbab35a3 100644
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra profilo residente" name="show_agent"/>
+	<menu_item_call label="Vedi profilo" name="show_agent"/>
+	<menu_item_call label="Manda IM..." name="send_im"/>
+	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 763e65f17c..8456d14b63 100644
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra informazioni oggetto" name="show_object"/>
+	<menu_item_call label="Profilo oggetto..." name="show_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index cdfa97bb3c..16f5a7a89b 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Stato" name="Status">
-			<menu_item_call label="Assente" name="Set Away"/>
-			<menu_item_call label="Non disponibile" name="Set Busy"/>
-		</menu>
+		<menu label="Stato" name="Status"/>
 		<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="Dashboard dell&apos;account..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversazioni..." name="Conversations"/>
+		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
-		<menu_item_check label="Impostazioni voce..." name="Nearby Voice"/>
-		<menu_item_check label="Manipolazione voce..." name="ShowVoice"/>
+		<menu label="Manipolazione voce" name="VoiceMorphing">
+			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
+			<menu_item_check label="Anteprima..." name="Preview"/>
+			<menu_item_call label="Abbonati..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesture..." name="Gestures"/>
-		<menu_item_call label="Amici" name="My Friends"/>
-		<menu_item_call label="Gruppi" name="My Groups"/>
-		<menu_item_call label="Persone vicine" name="Active Speakers"/>
+		<menu_item_check label="Amici" name="My Friends"/>
+		<menu_item_check label="Gruppi" name="My Groups"/>
+		<menu_item_check label="Persone vicine" name="Active Speakers"/>
 		<menu_item_call label="Blocca lista" name="Block List"/>
 	</menu>
 	<menu label="Mondo" name="World">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index d5fdde4e7d..8adbebb62a 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -513,6 +513,24 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://support.amd.com/it/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.nvidia.it/Download/index.aspx?lang=it
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -1548,10 +1566,13 @@ Vuoi cancellare quell&apos;elemento?
 		Impossibile offrire l&apos;amicizia in questo momento. Riprova fra poco.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		È stata impostata la modalità Non disponibile.
-La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino.
-		<usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Non disturbare è attivo.  Non riceverai la notifica delle comunicazioni in arrivo.
+
+- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze &gt; Generali).
+- Le offerte di teleport verranno rifiutate.
+- Le chiamate voce verranno rifiutate.
+		<usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l&apos;offerta.
@@ -2039,6 +2060,10 @@ Trasferisci gli elementi nell&apos;inventario?
 		Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account?
 		<usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione.  Tutti i partecipanti riceveranno notifiche per la nuova conversazione.
+		<usetemplate ignoretext="Conferma l&apos;aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Confermi di voler uscire?
 		<usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/>
@@ -2113,14 +2138,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 			<button ignore="Never Replace" name="No" text="Annulla"/>
 		</form>
 	</notification>
-	<notification label="Avviso di &apos;Occupato&apos;" name="BusyModePay">
-		Sei in modalità &apos;Occupato&apos;, ciò significa che non riceverai ciò che attendi per questo pagamento.
+	<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
+		Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
 
-Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
+Vuoi disattivare la modalità Non disturbare prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="OK"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Abbandona"/>
+			<ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/>
+			<button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/>
+			<button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2255,11 +2280,8 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 	<notification name="GroupNotice">
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
@@ -2487,13 +2509,6 @@ Qui non puoi volare.
 	<notification name="DynamicPathfindingDisabled">
 		Il pathfinding dinamico non è attivato in questa regione.  Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento.  Per fare in modo che gli oggetti in movimento si comportino correttamente, fai clic sul pulsante &quot;Rebake regione&quot;.  Per maggiori informazioni, seleziona la guida
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Guida" ignoretext="Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Si è verificato un errore.  Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione.  A volte il problema viene risolto uscendo ed eseguendo nuovamente l&apos;accesso.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2754,9 +2769,9 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+		Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
   
-Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
+Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
 			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
@@ -3338,4 +3353,633 @@ Tentativo annullato.
 		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
 		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelato.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] ti ha scongelato.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar scongelato.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		La congelazione non ha avuto successo perché non hai le autorizzazioni dell&apos;amministratore per quel lotto.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Non sei più congelato, puoi continuare.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Non puoi congelare quell&apos;utente.
+	</notification>
+	<notification name="NowOwnObject">
+		Sei ora il proprietario dell&apos;oggetto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Non puoi rezzare l&apos;oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno.  Usa lo strumento terreno per visualizzare a chi appartiene il terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Oggetto non razzato perché ci sono troppe richieste.
+	</notification>
+	<notification name="SitFailCantMove">
+		Non puoi sederti perché al momento non puoi muoverti.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Non puoi sederti perché non ti è consentito entrare in quel terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Proba ad avvicinarti.  Non puoi sederti su un oggetto perché
+non è nella stessa regione in cui ti trovi.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Impossibile creare il nuovo oggetto. La regione è piena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Non puoi creare alberi ed erba su terreni che non sono di tua proprietà.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Copia non riuscita perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; non può essere trasferito a te.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; contribuisce al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicato senza oggetto principale selezionato.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossibile duplicare gli oggetti perché la regione è piena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Impossibile creare l&apos;oggetto perché 
+il lotto è pieno.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Tentativo di rezzare un oggetto non riuscito.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossibile creare un oggetto che ha causato problemi in questa regione.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		L&apos;oggetto dell&apos;inventario è stato aggiunto alla blacklist.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Ricerca terreno bloccata.
+Hai eseguito troppe ricerche terreno in un breve tempo.
+Riprova tra un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sei deceduto e sei stato teleportato alla tua posizione iniziale
+	</notification>
+	<notification name="EjectComingSoon">
+		Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Non puoi entrare in questa regione perché 
+il server è pieno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Opzione Salva nell&apos;inventario disattivata
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché l&apos;oggetto da cui è stato razzato non esiste più.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossibile riportare &apos;[OBJ_NAME]&apos; nell&apos;inventario -- questa operazione è stata disattivata.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Non puoi copiare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La rimozione dell&apos;oggetto &apos;[OBJ_NAME]&apos; dal simulatore non è consentita dal sistema delle autorizzazioni.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Non puoi salvare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Non puoi salvare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere copiato.
+	</notification>
+	<notification name="NoModNoTaking">
+		Non puoi prendere l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Errore interno: Tipo di destinazione sconosciuto.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Cancellazione non riuscita perché l&apos;oggetto non è stato trovato.
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Non puoi espellere quell&apos;utente.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="HomePositionSet">
+		Posizione di base impostata.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar espulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		L&apos;espulsione non ha avuto successo perché non hai l&apos;autorizzazione dell&apos;amministratore del lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l&apos;oggetto su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché nell&apos;altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Non hai l&apos;autorizzazione necessaria per modificare questa immagine
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossibile attivare la fisica per oggetti keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossibile attivare la fisica per l&apos;oggetto -- risorse di terreno insufficienti.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Aggiunta elemento non riuscita
+	</notification>
+	<notification name="UnableEditItem">
+		Impossibile modificare questo elemento.
+	</notification>
+	<notification name="NoPermToEdit">
+		Non sei autorizzato a modificare questo elemento.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Non ti è permesso copiare quell&apos;inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossibile salvare i contenuti dell&apos;oggetto: L&apos;elemento non esiste più.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossibile salvare i contenuti dell&apos;oggetto: Nell&apos;inventario esiste già un elemento con quel nome.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossibile salvare i contenuti dell&apos;oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
+	</notification>
+	<notification name="TooManyScripts">
+		Troppi script.
+	</notification>
+	<notification name="UnableAddScript">
+		Aggiunta script non riuscita.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Il server degli asset non ha inviato una risposta entro il tempo massimo.  Oggetto restituito al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In questa regione non sono attivate le forme per la fisica.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossibile impostare le proprietà della fisica per quel tipo di oggetto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		impossibile impostare un prim principale senza forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In questa regione non sono attivati i materiali per la fisica.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		I materiali per la fisica possono essere modificati solo i prim principali.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		L&apos;impostazione dei materiali per la fisica nei caratteri non è ancora supportata.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Almeno una delle proprietà dei materiali per la fisica non è valida.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Non puoi alterare il tipo di punto di un oggetto con reticolo
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Non puoi alterare la forma di un oggetto con reticolo
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Non puoi entrare in questa regione perché è piena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Collegamento non riuscito -- i proprietari non corrispondono
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Collegamento non riuscito -- troppe primitive.
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Collegamento non riuscito -- niente di collegabile.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Collegamento non riuscito -- troppi personaggi con pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Collegamento non riuscito -- risorse terreno non sufficienti
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		L&apos;oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sei stato teleportato nella posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos; del lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sei stato teleportato nella tua posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di un utente sconosciuto.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Impossibile creare l&apos;oggetto richiesto. La regione è piena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Non puoi collegare più oggetti a un singolo luogo.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Non puoi creare oggetti multipli in questa posizione.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Impossibile creare l&apos;oggetto richiesto. L&apos;oggetto non è presente nel database.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Impossibile creare l&apos;oggetto richiesto. Tempo scaduto per la richiesta. Riprova.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Impossibile creare l&apos;oggetto richiesto. Riprova.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Rezzing non riuscito. Il caricamento dell&apos;oggetto richiesto è durato troppo a lungo.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Non puoi creare piante su questo terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossibile ripristinare l&apos;oggetto. Nessuna posizione trovata nel mondo virtuale.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossibile rezzare l&apos;oggetto perché i dati del reticolo non sono validi.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossibile rezzare l&apos;oggetto perché ci sono già troppi script in questa regione.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione.
+	</notification>
+	<notification name="CantCreateObject">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parametri oggetto non validi
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione.
+	</notification>
+	<notification name="CantChangeShape">
+		Non ti è consentito modificare questa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Assegnazione non riuscita perché non hai l&apos;autorizzazione necessaria per assegnare oggetti per il tuo gruppo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossibile collegare l&apos;oggetto perché un avatar è seduto sopra.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Alberi ed erba non possono essere indossati come collegati.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossibile collegare oggetti di proprietà di un gruppo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Non puoi collegare oggetti che non sono di tua proprietà.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossibile collegare oggetti che contribuiscono a navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		L&apos;oggetto non può essere collegato perché non sei autorizzato a muoverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Non puoi lasciare elementi collegati con reticolo. Separa nell&apos;inventario e quindi rezza nel mondo virtuale.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Impossibile rimuovere l&apos;elemento collegato: non hai l&apos;autorizzazione necessaria per rimuoverlo qui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Impossibile rimuovere l&apos;elemento collegato: risorse terreno disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Non puoi lasciare l&apos;oggetto qui.  Il lotto è pieno.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Limita i parametri per la cancellazione.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Impossibile caricare l&apos;asset.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Utente da teleportare alla posizione iniziale non trovato
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		richiesta superpoteri non riuscita
+	</notification>
+	<notification name="GenericRequestFailed">
+		richiesta generica non riuscita
+	</notification>
+	<notification name="CantUploadPostcard">
+		Impossibile caricare la cartolina.  Riprova più tardi.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		I dettagli dell&apos;inventario per la notifica di gruppo non sono stati trovati.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossibile inviare la notifica di gruppo -- non consentita.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossibile inviare la notifica di gruppo -- impossibile costruire l&apos;inventario.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossibile analizzare l&apos;inventario nella notifica.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Caricamento terreno non riuscito.
+	</notification>
+	<notification name="TerrainFileWritten">
+		File terreno scritto.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		File terreno generato, avvio del download...
+	</notification>
+	<notification name="TerrainBaked">
+		Baking terreno completata.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Devi aggiornare il Viewer per poter acquistare questo lotto.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Impossibile acquistare, questo lotto non è in vendita.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Impossibile acquistare. Il prezzo o l&apos;area del terreno sono stati cambiati.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Non sei l&apos;acquirente autorizzato di questo lotto.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Non puoi acquistare questo lotto perché è in attesa di autorizzazione all&apos;acquisto
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		hai selezionato terreni con proprietari diversi. Seleziona un&apos;area più piccola e riprova.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Non sono stati selezionati abbastanza lotti affittati da collegare.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -&gt; Segnala bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Impossibile suddividere il terreno. È stato selezionato l&apos;intero lotto.\nProva a selezionare un pezzo di terreno più piccolo.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Il terreno è stato diviso.
+	</notification>
+	<notification name="PassPurchased">
+		Hai acquistato un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Nella regione non sono permessi gli annunci pubblicitari.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Il tuo pass per questo terreno è quasi scaduto.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Nessuna superficie adatta a sedersi, prova un altro luogo.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Non c&apos;è posto per sedersi, prova un altro luogo.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai l&apos;autorizzazione necessaria.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Non puoi assegnare terreno di proprietà di un gruppo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		L&apos;acquisto dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		L&apos;acquisto dell&apos;inventario non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Non hai abbastanza L$ per acquistare un pass per questo terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Al momento non puoi acquistare un pass.  Riprova più tardi.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Impossibile creare l&apos;oggetto perché il lotto è pieno.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossibile creare il punto di riferimento per l&apos;evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		I tuoi superpoteri hanno interrotto la congelazione.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Richiesta di poteri speciali non riuscita. La richiesta è stata registrata.
+	</notification>
+	<notification name="ExpireExplanation">
+		Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta.
+	</notification>
+	<notification name="DieExplanation">
+		Il sistema non è in grado di elaborare la tua richiesta.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Denaro insufficiente per creare una primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Denaro insufficiente per creare un oggetto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Posizione iniziale ripristinata perché non era valida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="SetHomePosition">
+		Posizione di base impostata.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossibile derazzare l&apos;oggetto a causa di un errore nell&apos;inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Impossibile creare l&apos;inventario richiesto.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Impossibile creare la cartella dell&apos;inventario richiesta.
+	</notification>
+	<notification name="CantCreateInventory">
+		Impossibile creare quell&apos;inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Impossibile creare il punto di riferimento.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Il vestiario non può essere creato in questo momento. Riprova tra un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventario non è in vendita.
+	</notification>
+	<notification name="CantFindInvItem">
+		Impossibile trovare l&apos;elemento nell&apos;inventario.
+	</notification>
+	<notification name="CantFindObject">
+		Impossibile trovare l&apos;oggetto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Non si capisce chi deve essere pagato.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Non puoi dare L$ a oggetti pubblici.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Creazione inventario non riuscito per un oggetto nel mondo virtuale.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un errore interno ha impedito l&apos;aggiornamento del Viewer.  Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Non puoi creare prim grandi che intersecano altri giocatori.  Riprova quando gli altri giocatori si sono spostati.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file.
+		<usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L&apos;elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati.
+		<usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossibile spostare i file. Il percorso precedente è stato ripristinato.
+		<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index ede19b9e5a..cfceb5b982 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
 	<icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
index 610f561a65..7ca2d3b57b 100644
--- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Blocca lista
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
-	<button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/>
-	<button label="Blocca l&apos;oggetto per nome..." label_selected="Blocca l&apos;oggetto per nome..." name="Block object by name..."/>
-	<button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/>
+		<menu_button name="view_btn" tool_tip="Opzioni Ordina"/>
+		<menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/>
+		<button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ca6b65300a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(caricamento in corso)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..624eaa639c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/>
+	<icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/>
+	<button name="delete_btn" tool_tip="Elimina questo elemento"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
index 7cdc4c7ff6..72e644008c 100644
--- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Sconosciuto"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index f903ae6e2c..e1468db76e 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -14,81 +14,53 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_filtered_friends_msg">
 		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
-	<string name="people_filter_label" value="Filtro persone"/>
-	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtro persone" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
-		<panel label="I MIEI AMICI" name="friends_panel">
+		<panel label="AMICI" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtro persone" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="I MIEI GRUPPI" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
-				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
+		<panel label="GRUPPI" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtro gruppi" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/>
+				<menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
+				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtro persone" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
+		<panel label="BLOCCATO" name="blocked_panel">
+			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 0c9c4027e5..c2ac6e97a9 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<text name="font_size">
-		Dimensioni caratteri:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Piccola" name="radio" value="0"/>
-		<radio_item label="Media" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
-	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
-	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
-	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostra gli IM in:
-	</text>
-	<text name="requires_restart_label">
-		(richiede il riavvio)
-	</text>
-	<radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)">
-		<radio_item label="Finestre separate" name="radio" value="0"/>
-		<radio_item label="Schede" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Attiva popup per chat in arrivo:
-	</text>
-	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
-	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
-	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
-	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Dimensioni caratteri:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Piccolo" name="Small" value="0"/>
+			<item label="Medio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notifiche
+		</text>
+		<text name="friend_ims">
+			IM degli amici:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM non di amici:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM conferenza:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Chat di gruppo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Chat nei dintorni:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Nessuno" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Riproduci suono:
+		</text>
+		<check_box label="Nuova conversazione" name="new_conversation"/>
+		<check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/>
+		<check_box label="Offerta di Teleport" name="teleport_offer"/>
+		<check_box label="Offerta inventario" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Cancella registro..." name="clear_log"/>
+		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
+		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
+	</panel>
 	<button label="Traduzione..." name="ok_btn"/>
 	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
 	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 90a833471c..45cc06c2ea 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="mai" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Risposta in modalità occupato:
+		Risposta Non disturbare:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 8a0f93e650..5f912dd126 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Acquista oggetto" name="Buyobject"/>
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
+			<combo_box.item label="Ingrandisci" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index fb1e387468..f95318542b 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=it-IT&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
@@ -616,8 +616,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AvatarAway">
 		Assente
 	</string>
-	<string name="AvatarBusy">
-		Occupato
+	<string name="AvatarDoNotDisturb">
+		Non disturbare
 	</string>
 	<string name="AvatarMuted">
 		Mutato
@@ -853,6 +853,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ST_NO_JOINT">
 		Impossibile trovare ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat nei dintorni
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat nei dintorni)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -916,6 +922,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
+	<string name="AgentNameSubst">
+		(Tu)
+	</string>
 	<string name="TeleportYourAgent">
 		Teleportarti
 	</string>
@@ -1000,18 +1009,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="dictionary_files">
 		Dizionari
 	</string>
-	<string name="AvatarSetNotAway">
-		Imposta come non assente
-	</string>
-	<string name="AvatarSetAway">
-		Imposta come assente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Imposta come non occupato
-	</string>
-	<string name="AvatarSetBusy">
-		Imposta come occupato
-	</string>
 	<string name="shape">
 		Figura corporea
 	</string>
@@ -1968,8 +1965,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="PanelContentsNewScript">
 		Nuovo script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
+	<string name="DoNotDisturbModeResponseDefault">
+		Questo residente ha attivato la modalità &apos;Non disturbare&apos; e vedrà il tuo messaggio più tardi.
 	</string>
 	<string name="MuteByName">
 		(In base al nome)
@@ -2082,9 +2079,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenuto
-	</string>
 	<string name="AcquiredItems">
 		Oggetti acquisiti
 	</string>
@@ -3799,7 +3793,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Regione generale
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visibili e chat consentita fuori di questo lotto
+		Gli avatar in questo lotto non possono essere visti o sentiti da avatar all&apos;esterno del lotto
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione.
@@ -3876,6 +3870,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Per vedere questo messaggio, devi deselezionare &apos;Solo amici e gruppi possono chiamarmi o mandarmi IM&apos; in Preferenze/Privacy.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
@@ -3885,6 +3885,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Ti sei collegato alla chiamata in voce
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità &apos;Non disturbare&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] ha iniziato una chiamata vocale
 	</string>
@@ -3897,6 +3900,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Chiusa la chiamata
 	</string>
+	<string name="conference-title">
+		Chat con più persone
+	</string>
 	<string name="conference-title-incoming">
 		Chiamata in conferenza con [AGENT_NAME]
 	</string>
@@ -4769,6 +4775,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversazioni
+	</string>
 	<string name="Command_Compass_Label">
 		Bussola
 	</string>
@@ -4844,6 +4853,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Tooltip">
 		Chatta con persone vicine usando il testo
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversa con chiunque
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bussola
 	</string>
@@ -4973,4 +4985,13 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
new file mode 100644
index 0000000000..98b1a59a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="会話ログ">
+	<panel name="buttons_panel">
+		<filter_editor label="人をフィルター" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ea0b23de48
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="会話:">
+	<floater.string name="Title">
+		会話:[NAME]
+	</floater.string>
+	<text name="page_label" value="ページ"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index 06b65e27f0..a155efdc1e 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="会話"/>
+<multi_floater name="floater_im_box" title="会話">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
+					<button name="add_btn" tool_tip="新しい会話を開始"/>
+					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
+					<text name="stub_textbox">
+						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index dfa1c85ca2..a44c843df7 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="宛先" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
+	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
+	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
+	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
+				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
+				<button name="close_btn" tool_tip="この会話を終了する"/>
+				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="宛先" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index f152fcd738..308f6f9a3d 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		匿名ユーザー
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		がコールしています。
+		からコールを受けています。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		がコンファレンスチャットで、ボイスチャットに参加しました。
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
+		コールに応答すると、現在のボイスチャットから切断されます。
 	</text>
-	<button label="はい" label_selected="はい" name="Accept"/>
-	<button label="いいえ" label_selected="いいえ" name="Reject"/>
-	<button label="IM" name="Start IM"/>
+	<button label="取る" label_selected="取る" name="Accept"/>
+	<button label="無視" label_selected="無視" name="Reject"/>
+	<button label="代わりに IM を開く" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index ec107f3e6b..9733c61918 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				表示：
 			</text>
-			<check_box label="世界" name="show_world"/>
+			<check_box label="テスト" name="show_world"/>
 			<check_box label="可動物のみ" name="show_world_movables_only"/>
 			<check_box label="ナビメッシュ" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 3773812bb6..37233d3e68 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="ライブプレビュー" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="プレビュー無効"/>
 	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
 	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..44e96c35ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ボイスチャットの音量">
+	<slider label="ボイスチャット" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index ee675e143b..b38ea9331a 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィング">
+<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
 	<string name="no_voice_effect">
 		（ボイスモーフィングなし）
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
new file mode 100644
index 0000000000..a380615d5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ボイス音量">
+	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index a071abbd2e..07bcefd9b3 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
new file mode 100644
index 0000000000..c7df20d252
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="会話を終える" name="close_conversation"/>
+	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
+	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="フレンドを追加" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+	<menu_item_call label="グループ情報" name="group_profile"/>
+	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
+	<menu_item_call label="グループから脱退する" name="leave_group"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
+		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..c9d4f947a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="ボイスコール..." name="Call"/>
+	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="Invite"/>
+	<menu_item_call label="地図" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..bd4812603f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
+	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
new file mode 100644
index 0000000000..55cd6610f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..222a741718
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="簡略表示" name="compact_view"/>
+	<menu_item_check label="詳細表示" name="expanded_view"/>
+	<menu_item_check label="時間を表示" name="IMShowTime"/>
+	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 8c4f328661..6448e9244e 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
 	<menu_item_call label="ブロック..." name="Block"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
+	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 2bcbe1915b..1969ae2a10 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="髪" name="New Hair"/>
 		<menu_item_call label="目" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="フォルダをすべて開く" name="expand"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
new file mode 100644
index 0000000000..5816351d9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
+	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
+	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
+	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
+	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
+	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
+	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
+	<menu_item_check label="会話ログ..." name="Conversation"/>
+	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
+	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..b5c9d11e02
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_call label="プロフィール..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..3e74b2ddff
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
+	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..4b86a353f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
new file mode 100644
index 0000000000..b95d11fdbd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
+	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 842d79dc4b..2c0c85ba28 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="ボイスコール" name="Call"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
new file mode 100644
index 0000000000..4a9e402fa4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 8d84b0e521..972ab767bf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールの表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index 3f20e5d3ab..fe85e278cf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="Add Friends"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friends"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="コール" name="call"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..b7cccc4396
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="地図を表示" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
new file mode 100644
index 0000000000..feaeba4398
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 92d118a5ae..72722db7cc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
+	<menu_item_call label="プロフィールを表示" name="show_agent"/>
+	<menu_item_call label="IM を送信..." name="send_im"/>
+	<menu_item_call label="フレンドを追加..." name="add_friend"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index d6a048dcfc..9e340e3239 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
+	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 74859076c2..725ceff208 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="ログイン" name="Status">
-			<menu_item_call label="一時退席中" name="Set Away"/>
-			<menu_item_call label="取り込み中" name="Set Busy"/>
-		</menu>
+		<menu label="ログイン" name="Status"/>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
 		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
 		<menu_item_call label="マイアカウント..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="チャット..." name="Nearby Chat"/>
+		<menu_item_check label="会話..." name="Conversations"/>
+		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
-		<menu_item_check label="ボイス設定..." name="Nearby Voice"/>
-		<menu_item_check label="ボイスモーフィング..." name="ShowVoice"/>
+		<menu label="ボイスモーフィング" name="VoiceMorphing">
+			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
+			<menu_item_check label="プレビュー..." name="Preview"/>
+			<menu_item_call label="申し込む..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_call label="フレンド" name="My Friends"/>
-		<menu_item_call label="グループ" name="My Groups"/>
-		<menu_item_call label="近くにいる人" name="Active Speakers"/>
+		<menu_item_check label="フレンド" name="My Friends"/>
+		<menu_item_check label="グループ" name="My Groups"/>
+		<menu_item_check label="近くにいる人" name="Active Speakers"/>
 		<menu_item_call label="リストをブロック" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index d5cff18a24..356506f191 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -538,6 +538,24 @@ L$ が不足しているのでこのグループに参加することができ
 		</url>
 		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -1582,10 +1600,13 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		現在フレンドシップを送れません。数分後にもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		取り込み中モードになりました。
-チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
-		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		「通知を受けない」がオンになります。着信通信はあなたには通知されません。
+
+- 他の住民は「通知を受けない」の応答（「設定」&gt;「一般」で設定）を受け取ることになります。
+- テレポートのオファーはすべて受け取り拒否となります。
+- ボイスコールは拒否されます。
+		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
@@ -2076,6 +2097,10 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		終了しようとしています。続けますか？
 		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
@@ -2153,14 +2178,14 @@ Linden Lab
 			<button ignore="交換しない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
-	<notification label="取り込み中の警告" name="BusyModePay">
-		現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。
+	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
+		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
 
-この取引を行うために「取り込み中」の設定を解除しますか？
+このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/>
-			<button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/>
-			<button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/>
+			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
+			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
+			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2296,11 +2321,8 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="GroupNotice">
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオンラインです
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオフラインです
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2530,13 +2552,6 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="DynamicPathfindingDisabled">
 		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。移動オブジェクトを正しく動作させるには、「地域の再構築」ボタンをクリックします。詳しい情報は見るには「ヘルプ」を選択してください。
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="ヘルプ" ignoretext="この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。" name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2797,9 +2812,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		警告：オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
+		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
   
-このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
+そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
 		<form name="form">
 			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
@@ -3378,4 +3393,627 @@ M キーを押して変更します。
 		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
 		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		アバターがフリーズされています。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] によってフリーズが解除されています。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		アバターのフリーズが解除されました。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		その区画の管理権限を持っていないため、フリーズに失敗しました。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		フリーズ期間が切れました。仕事に戻ってください。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		残念ながら、そのユーザーをフリーズできません。
+	</notification>
+	<notification name="NowOwnObject">
+		これで、オブジェクト [OBJECT_NAME] の所有者になりました
+	</notification>
+	<notification name="CantRezOnLand">
+		この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		リクエストが多すぎて、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="SitFailCantMove">
+		今回移動できなかったため、座ることができません。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		その土地に対して許可を受けていないため、座ることができません。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		新しいオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		所有していない土地に木や草を植えることはできません。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーする権限がないため、コピーに失敗しました。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をあなたに転送できないため、コピーに失敗しました。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; がナビメッシュに貢献しているため、コピーに失敗しました。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		ルートオブジェクトを選択せずに複製します。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		リージョンが埋まっているため、オブジェクトのコピーを作成することができません。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		区画がいっぱいのため、
+オブジェクトを作成できません。
+	</notification>
+	<notification name="RezAttemptFailed">
+		オブジェクトへの Rez の試みに失敗しました。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		このリージョンで問題を引き起こすアイテムは作成できません。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		その持ち物アイテムはブラックリストに登録されています。
+	</notification>
+	<notification name="NoCanRezObjects">
+		現在あなたにはオブジェクトを作成するための許可がありません。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地の検索がブロックされました。
+短期間に多くの土地を検索したためです。
+しばらくしてから再度お試しください。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		死んでしまったので、ホームにテレポートされました。
+	</notification>
+	<notification name="EjectComingSoon">
+		ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。
+	</notification>
+	<notification name="NoEnterServerFull">
+		サーバーが埋まっているため、
+このリージョンに入場することはできません。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「「持ち物」に保存」が無効になっています。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		オブジェクト &apos;[DEST_NAME]&apos; を修正する権限がないため、オブジェクトのコンテンツに &apos;[OBJ_NAME]&apos; を保存できません。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		インベントリに &apos;[OBJ_NAME]&apos; を保存することはできません - この操作が無効になっています。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		シミュレータからのオブジェクト &apos;[OBJ_NAME]&apos; の削除は、権限システムによって無効にされています。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーできないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoModNoTaking">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを取得できません。
+	</notification>
+	<notification name="RezDestInternalError">
+		内部エラー: 不明な宛先タイプ。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		オブジェクトが見つからないため削除できませんでした。
+	</notification>
+	<notification name="SorryCantEjectUser">
+		残念ながら、そのユーザーを追放することはできません。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="HomeLocationLimits">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="HomePositionSet">
+		家の配置の設定。
+	</notification>
+	<notification name="AvatarEjected">
+		アバターが追放されました。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		その区画の管理権限がないため、追放できませんでした。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		区画が埋まっているため、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		オブジェクト &apos;[OBJECT_NAME]&apos; は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		この区画でこのオブジェクトのリソースが不足しているため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		不明な理由により、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		そのオブジェクトを変更する権限がありません
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		キーフレームオブジェクトのために物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		土地のリソースが足りないため、オブジェクトの物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+	</notification>
+	<notification name="UnableAddItem">
+		アイテムを追加できません!
+	</notification>
+	<notification name="UnableEditItem">
+		これは編集できません!
+	</notification>
+	<notification name="NoPermToEdit">
+		これを編集する許可がありません。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		そのインベントリをコピーすることは許可されません。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。
+	</notification>
+	<notification name="TooManyScripts">
+		スクリプトが多すぎます。
+	</notification>
+	<notification name="UnableAddScript">
+		テキストを追加できません!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		このリージョンでは、物理的シェイプが有効にされていません。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		そのオブジェクトタイプの物理的プロパティを設定できません。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		ルートプリムを設定できないため、シェイプがありません。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		このリージョンでは、物理的素材が有効にされていません。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		物理的素材を調整できるのは、ルートプリムだけです。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		キャラクターへの物理的素材の設定はまだサポートされていません。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定した物理的素材のプロパティが 1 つ以上無効です。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		メッシュオブジェクトの縫い目のタイプを変更することはできません。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		メッシュオブジェクトの形状を変更することはできません
+	</notification>
+	<notification name="FullRegionCantEnter">
+		リージョンが埋まっているため、\nこのリージョンに入場できません。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		リンクエラー -- 所有者が違います
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		リンクエラー -- 編集権限がありません。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		リンクエラー -- プリミティブが多すぎます。
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		リンクエラー -- コピーなしと転送なしをリンクできません。
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		リンクエラー -- リンクできるものがありません。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		リンクエラー -- パスファインディングの文字数が多すぎます
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		リンクエラー -- 土地のリソースが足りません
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはホームにテレポートされました。
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		​オブジェクト ​&apos;[OBJECT_NAME]&apos; によって、あなたはホームへテレポートされています。
+	</notification>
+	<notification name="TeleportedByAttachment">
+		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		[OWNER_ID] が所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		不明なユーザーが所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		1 つの場所に複数のオブジェクトを着用することはできません。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		ここでは、複数のオブジェクトを作成することはできません。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		要求されたオブジェクトを作成できません。もう一度お試しください。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		この土地に木を植えることはできません。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		オブジェクトをリストアできません。ワールドの位置が見つかりません。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		メッシュデータが無効なため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		現在のアクセス権限では、そこにオブジェクトを作成できません。
+	</notification>
+	<notification name="CantCreateObject">
+		現在あなたにはオブジェクト作成する許可がありません。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無効なオブジェクトパラメーター
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+	</notification>
+	<notification name="CantChangeShape">
+		あなたにはこのシェイプを変更する許可がありません。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		現在のアクセス権限では、ここにオブジェクトを取得できません。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		現在のアクセス権限では、ここでオブジェクトを購入できません。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		木や草をアタッチメントとして着用できません。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		グループが所有しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		所有していないオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		ナビメッシュに貢献しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		ここにオブジェクトをドロップできません。区画が埋まっています。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		削除パラメーターを絞ってください。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		資産をアップロードできません。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		ホームをテレポートするユーザーが見つかりませんでした。
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		過剰なリクエストが失敗しました
+	</notification>
+	<notification name="GenericRequestFailed">
+		一般的なリクエストに失敗しました
+	</notification>
+	<notification name="CantUploadPostcard">
+		ポストカードをアップロードできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		グループ通知のインベントリの詳細を取得できません。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		グループ通知の送信が許可されないため、送信できません。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		グループ通知を送信できません。持ち物を作成することもできません。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		通知内の持ち物を検出できません。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形のアップロードに失敗しました。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形ファイルが書き込まれました。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形ファイルを書き出し、ダウンロードを開始しています...
+	</notification>
+	<notification name="TerrainBaked">
+		地形がベークされました。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		この区画を購入するには、ビューワをアップデートする必要があります。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		購入することができません。この区画は販売対象ではありません。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		販売価格または土地の面積が変わったため、購入できません。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		あなたはこの区画の委任された買い手ではありません。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		すでに購入の認証を待機しているため、この区画を購入できません。
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		選択範囲のリース区画の数が少ないため、参加できません。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		土地を分解できません。\n区画が見つかりません。\n「Help」&gt;「Reprt Bug...」でレポートを行ってください。
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地が分割されています。
+	</notification>
+	<notification name="PassPurchased">
+		入場許可を購入しました。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		リージョンでは、クラシファイド広告を許可しません。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		この土地への入場許可はまもなく期限が切れます。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		配置に適した表面がありません。別の場所を試してみたください。
+	</notification>
+	<notification name="CantSitNoRoom">
+		ここには座る余地がありません。他の場所を試してください。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		権限がないため、オブジェクトを取得できませんでした。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		グループ所有の土地は、譲渡できません。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		リンデンドルが不足しているため、インベントリを購入できませんでした。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		リンデンドルが足りないため、この土地への入場許可を購入できません。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		今すぐには入場許可を購入できません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		区画が埋まっているため、オブジェクトを\n作成することができません。
+	</notification>
+	<notification name="FailedPlacingObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		イベントのためのランドマークを作成することができません。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		強力な力でフリーズを解除します。
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+	</notification>
+	<notification name="ExpireExplanation">
+		システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+	</notification>
+	<notification name="DieExplanation">
+		システムは、あなたのリクエストを処理できません。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		プリミティブ広告を出すには、資金が足りません。
+	</notification>
+	<notification name="RezObjectFailure">
+		資金が足りないため、オブジェクトを作成できません。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		ホームが不正なため、ホームの位置をリセットします。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="SetHomePosition">
+		家の配置の設定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		インベントリエラーのため、オブジェクトの Rez 解除ができません。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		リクエストされたインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		リクエストされた持ち物フォルダーを作成できません。
+	</notification>
+	<notification name="CantCreateInventory">
+		そのインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateLandmark">
+		ランドマークを作成できません。
+	</notification>
+	<notification name="CantCreateOutfit">
+		アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+	</notification>
+	<notification name="InventoryNotForSale">
+		インベントリは販売対象ではありません。
+	</notification>
+	<notification name="CantFindInvItem">
+		持ち物アイテムを見つけることができません。
+	</notification>
+	<notification name="CantFindObject">
+		オブジェクトが見つかりません。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		オブジェクトへの送金は、このリージョンでは現在無効にされています。
+	</notification>
+	<notification name="CantPayNoAgent">
+		支払いの相手を把握できませんでした。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		パブリックオブジェクトにリンデンドルを与えることはできません。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		インワールドオブジェクトでのインベントリ作成に失敗しました。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
+		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		ファイルを移動できません。以前のパスがリストアされました。
+		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 70d37c3bad..3ef8eba19f 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
 	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
 	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 5d6a6065ae..9263e5f347 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		ブロックリスト
-	</text>
-	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
-	<button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
-	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
-	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="フィルター" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
+		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
+		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
+		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..09ffb92d36
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（ローディング）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..e05a67e31d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
+	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
+	<button name="delete_btn" tool_tip="このエントリーを削除"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 4b548049c8..77d3d8f391 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="不明"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 88c31451b5..03ce87537a 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人" name="people_panel">
 	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
 	</string>
-	<string name="people_filter_label" value="人をフィルター"/>
-	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
-		<panel label="マイ フレンド" name="friends_panel">
+		<panel label="フレンド" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人をフィルター" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="マイ グループ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
-				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
+		<panel label="グループ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
+				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人をフィルター" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
+		<panel label="停止" name="blocked_panel">
+			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index b6e344ca48..ae5391c7bd 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<text name="font_size">
-		文字の大きさ：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
-	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IM の表示方法：
-	</text>
-	<text name="requires_restart_label">
-		（再起動後に反映）
-	</text>
-	<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）">
-		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
-		<radio_item label="タブ" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		受信チャットのポップアップを有効にする
-	</text>
-	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
-	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
-	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
-	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			文字の大きさ：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小規模" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大規模" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			通知
+		</text>
+		<text name="friend_ims">
+			フレンド IM:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			非フレンド IM:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			コンファレンス IM:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			グループチャット:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
+			<item label="なし" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			近くのチャット:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
+			<item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/>
+			<item label="フィルターなし" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			すべての通知を一時的に受け付けないようにするには、「コミュニケート」&gt;「通知を受けない」を使用します。
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			音の再生:
+		</text>
+		<check_box label="新しい会話" name="new_conversation"/>
+		<check_box label="ボイスコールの着信" name="incoming_voice_call"/>
+		<check_box label="テレポートを渡す" name="teleport_offer"/>
+		<check_box label="アイテムのオファー" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="ログのクリア..." name="clear_log"/>
+		<button label="テキストの削除..." name="delete_transcripts"/>
+		<button label="参照..." label_selected="参照" name="log_path_button"/>
+	</panel>
 	<button label="他の言語..." name="ok_btn"/>
 	<button label="自動置換..." name="autoreplace_showgui"/>
 	<button label="スペルチェック中..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 91e1514e49..d70af7e099 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="一時退席設定なし" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		取り込み中モード時の返事：
+		「通知を受けない」応答:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index c61c73657f..4f65c8477b 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
+			<combo_box.item label="ズーム" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 50697e5500..b27904c4d7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ja-JP&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
@@ -622,8 +622,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="AvatarAway">
 		一時退席中
 	</string>
-	<string name="AvatarBusy">
-		取り込み中
+	<string name="AvatarDoNotDisturb">
+		通知を受けない
 	</string>
 	<string name="AvatarMuted">
 		ブロック中
@@ -859,6 +859,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ST_NO_JOINT">
 		ROOT または JOINT が見つかりません
 	</string>
+	<string name="NearbyChatTitle">
+		近くのチャット
+	</string>
+	<string name="NearbyChatLabel">
+		(近くのチャット)
+	</string>
 	<string name="whisper">
 		のささやき:
 	</string>
@@ -922,12 +928,15 @@ support@secondlife.com にお問い合わせください。
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
-	<string name="TeleportYourAgent">
-		あなたをテレポート
-	</string>
 	<string name="NotConnected">
 		接続されていません
 	</string>
+	<string name="AgentNameSubst">
+		(あなた)
+	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1009,18 +1018,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="dictionary_files">
 		辞書
 	</string>
-	<string name="AvatarSetNotAway">
-		一時退席中解除
-	</string>
-	<string name="AvatarSetAway">
-		一時退席中
-	</string>
-	<string name="AvatarSetNotBusy">
-		取り込み中解除
-	</string>
-	<string name="AvatarSetBusy">
-		取り込み中
-	</string>
 	<string name="shape">
 		シェイプ
 	</string>
@@ -1989,8 +1986,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
-	<string name="BusyModeResponseDefault">
-		メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。  あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
+	<string name="DoNotDisturbModeResponseDefault">
+		この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。
 	</string>
 	<string name="MuteByName">
 		（名称別）
@@ -2103,9 +2100,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDate">
 		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		内容
-	</string>
 	<string name="AcquiredItems">
 		取得アイテム
 	</string>
@@ -3877,7 +3871,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		General リージョン
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		この区画外にアバターを見えるようにして、チャットも許可
+		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
@@ -3954,6 +3948,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="IM_unblock_only_groups_friends">
 		このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。
 	</string>
+	<string name="OnlineStatus">
+		オンライン
+	</string>
+	<string name="OfflineStatus">
+		オフライン
+	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
@@ -3963,6 +3963,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="you_joined_call">
 		ボイスコールに参加しました
 	</string>
+	<string name="you_auto_rejected_call-im">
+		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
+	</string>
 	<string name="name_started_call">
 		[NAME] はボイスコールを開始します
 	</string>
@@ -3979,7 +3982,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		接続中...
 	</string>
 	<string name="conference-title">
-		アドホックコンファレンス
+		複数人チャット
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] とコンファレンスする
@@ -4859,6 +4862,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Label">
 		チャット
 	</string>
+	<string name="Command_Conversations_Label">
+		会話
+	</string>
 	<string name="Command_Compass_Label">
 		コンパス
 	</string>
@@ -4934,6 +4940,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Tooltip">
 		近くの人と文字チャットする
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		全員との会話
+	</string>
 	<string name="Command_Compass_Tooltip">
 		コンパス
 	</string>
@@ -5063,4 +5072,13 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
new file mode 100644
index 0000000000..ae7dd3c441
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
new file mode 100644
index 0000000000..97a2e8327c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSA:">
+	<floater.string name="Title">
+		CONVERSA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index 0fbb826a96..a1cea72b1e 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAS"/>
+<multi_floater name="floater_im_box" title="CONVERSAS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
+					<button name="add_btn" tool_tip="Iniciar uma nova conversa"/>
+					<button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Recolher este painel"/>
+					<text name="stub_textbox">
+						Esta conversa está em uma janela separada.   [secondlife:/// Trazer de volta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 5543ffa41d..9f6a7a06ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Para" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/>
+	<floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/>
+	<floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/>
+	<floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexão por voz"/>
+				<button name="close_btn" tool_tip="Encerrar esta conversa"/>
+				<button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Para" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 6344258fa0..1e86f847ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz?
 	</floater.string>
 	<text name="question">
-		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
+		Se você atender, será desconectado de suas conversas de voz atuais.
 	</text>
-	<button label="Aceitar" label_selected="Aceitar" name="Accept"/>
-	<button label="Rejeitar" label_selected="Rejeitar" name="Reject"/>
-	<button label="Enviar MI" name="Start IM"/>
+	<button label="Atender" label_selected="Atender" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Iniciar MI em vez disso" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index 182f2513e0..d04cf2a173 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Exibir:
 			</text>
-			<check_box label="Mundo" name="show_world"/>
+			<check_box label="Testar" name="show_world"/>
 			<check_box label="Apenas móveis" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index a75cf34a94..ba4ef0afde 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box initial_value="true" label="Visualização em tempo real" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Visualização desativada"/>
 	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..de7aa2df12
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ">
+	<slider label="Bate-papo de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index b29ca3d699..71d3c33ae5 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ">
+<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
 	<string name="no_voice_effect">
 		(Não distorcer voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
new file mode 100644
index 0000000000..dae47a99ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE VOZ">
+	<slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
index 8716992a5e..b59895573e 100644
--- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Roupas novas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
new file mode 100644
index 0000000000..01316b887d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
+	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Remover amigos" name="remove_friends"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear voz" name="block_unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+	<menu_item_call label="Perfil do grupo" name="group_profile"/>
+	<menu_item_call label="Ativar grupo" name="activate_group"/>
+	<menu_item_call label="Sair do grupo" name="leave_group"/>
+	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
+		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
+		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..616e6db46e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Chamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/>
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Oferecer teletransporte" name="teleport"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..cab81175a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por data" name="sort_by_date"/>
+	<menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/>
+	<menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
new file mode 100644
index 0000000000..a8434dc336
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo" name="Add Friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..398b890f66
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Exibição compacta" name="compact_view"/>
+	<menu_item_check label="Exibição expandida" name="expanded_view"/>
+	<menu_item_check label="Mostrar hora" name="IMShowTime"/>
+	<menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index 7af760a6ee..df224a88fa 100644
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
 	<menu_item_call label="Bloquear..." name="Block"/>
+	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
+	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 894f1d741c..3602bdaac4 100644
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Novo cabelo" name="New Hair"/>
 		<menu_item_call label="Novos olhos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Expandir todas as pastas" name="expand"/>
+	<menu_item_call label="Recolher todas as pastas" name="collapse"/>
 	<menu_item_call label="Renomear look" name="rename"/>
 	<menu_item_call label="Excluir visual" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
new file mode 100644
index 0000000000..b61108cf54
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/>
+	<menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversas..." name="Conversation"/>
+	<menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/>
+	<menu_item_check label="Configurações de tradução..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..8bbde9b38c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Desbloquear" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..e69935995c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..b80d683c7b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
new file mode 100644
index 0000000000..46caeae310
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por status" name="sort_status"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
+	<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
index 9a924ad7b9..2ba7af17cd 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver dados" name="View Info"/>
 	<menu_item_call label="Bate-papo" name="Chat"/>
-	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Chamada de voz" name="Call"/>
 	<menu_item_call label="Ativar" name="Activate"/>
 	<menu_item_call label="Sair" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
new file mode 100644
index 0000000000..637e591ae1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 7c720f262b..51464fed68 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 79edb96b1c..7f3c6ace27 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friends"/>
+	<menu_item_call label="Remover amigo..." name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ligar" name="call"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..bce015e732
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
new file mode 100644
index 0000000000..e4b368fe14
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index ba5e055124..aa0a426405 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar perfil de residente" name="show_agent"/>
+	<menu_item_call label="Exibir perfil" name="show_agent"/>
+	<menu_item_call label="Enviar MI..." name="send_im"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index c197444181..247a92567a 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/>
+	<menu_item_call label="Perfil do objeto..." name="show_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index e8baff5af2..e54d49fc45 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
-		</menu>
+		<menu label="Status" name="Status"/>
 		<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="Painel da conta..." name="Manage My Account">
@@ -32,14 +29,18 @@
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
-		<menu_item_check label="Bate-papo..." name="Nearby Chat"/>
+		<menu_item_check label="Conversas..." name="Conversations"/>
+		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
-		<menu_item_check label="Configurações de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Distorção de voz..." name="ShowVoice"/>
+		<menu label="Distorção de voz" name="VoiceMorphing">
+			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Visualizar..." name="Preview"/>
+			<menu_item_call label="Assinar..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
 		<menu_item_call label="Lista de bloqueados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index ff7382bf80..d9f5e48745 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -510,6 +510,24 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://www.nvidia.com.br/Download/index.aspx?lang=br
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -1533,10 +1551,13 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Modo ocupado ativado. 
-O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua resposta de modo ocupado.  Todas as ofertas de teletransporte serão recusadas.  Todas as ofertas de inventário serão colocadas na Lixeira.
-		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Não perturbe está ativado.  Você não será notificado de comunicações recebidas.
+
+- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências &gt; Geral).
+- As ofertas de teletransporte serão recusadas.
+- Chamadas de voz serão recusadas.
+		<usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
@@ -2022,6 +2043,10 @@ Mover para o inventário o(s) item(s)?
 		Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta?
 		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada.  Todos os participantes recebem notificações sobre a nova conversa.
+		<usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Tem certeza que deseja sair?
 		<usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/>
@@ -2096,14 +2121,14 @@ Você deseja substituí-lo pelo objeto selecionado?
 			<button ignore="Never Replace" name="No" text="Não"/>
 		</form>
 	</notification>
-	<notification label="Aviso de Modo Ocupado" name="BusyModePay">
-		Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento.
+	<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
+		Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
 
-Você gostaria de deixar o modo Ocupado antes de completar esta transação?
+Deseja desativar o Não perturbe antes de concluir esta transação?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="Sim"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Não"/>
+			<ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/>
+			<button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/>
+			<button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2238,11 +2263,8 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 	<notification name="GroupNotice">
 		Assunto: [SUBJECT], Mensagem: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
@@ -2467,13 +2489,6 @@ Logo, não é possível voar aqui.
 	<notification name="DynamicPathfindingDisabled">
 		O pathfinding dinâmico não está habilitado nesta região.  Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento.  Para fazer com que os objetos em movimento se comportem corretamente, clique no botão “Recarregar região”.  Escolha “Ajuda” para obter mais informações.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Ajuda" ignoretext="A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Erro.  Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção.  Às vezes, fazer login e logout novamente resolve este problema.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2736,7 +2751,7 @@ OK?
 	<notification name="ScriptQuestionCaution">
 		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
   
-Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
+Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
 			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
@@ -3310,4 +3325,633 @@ Tentativa cancelada.
 		Você está excluindo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
 		<usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] descongelou você.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		O congelamento falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Seu congelamento expirou, vá cuidar da sua vida.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Não é possível congelar esse usuário.
+	</notification>
+	<notification name="NowOwnObject">
+		Agora você é o proprietário do objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite.  Use a ferramenta de terrenos para ver a propriedade do terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		O objeto não pode ser renderizado porque há muitas solicitações.
+	</notification>
+	<notification name="SitFailCantMove">
+		Você não pode sentar porque não pode se mover no momento.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Você não pode sentar porque não está autorizado a sentar nesse terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Tente chegar mais perto.  Não é possível sentar no objeto porque
+ele não está na mesma região que você.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Não foi possível criar um novo objeto. A região está cheia.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Você não pode criar árvores e grama em terrenos que não são sua propriedade.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		A cópia falhou porque você não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; não pode ser transferido para você.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; contribui para o navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicar sem objetos raiz selecionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Não é possível duplicar objetos porque a região está cheia.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Não é possível criar objeto porque 
+o lote está cheio.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Falha na tentativa de renderizar um objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Não é possível criar um item que causou problemas a essa região.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Esse item do inventário foi incluído na lista.
+	</notification>
+	<notification name="NoCanRezObjects">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Pesquisa de terreno bloqueada.
+Você realizou muitas pesquisas de terreno muito rápido.
+Tente novamente em instantes.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Você morreu e foi teletransportado para seu início
+	</notification>
+	<notification name="EjectComingSoon">
+		Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Você não pode entrar nesta região porque 
+o servidor está cheio.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Salvar no inventário foi desativado.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque você não tem permissão para modificar o objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no inventário -- essa operação foi desativada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Você não pode copiar sua seleção porque não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		A remoção do objeto &apos;[OBJ_NAME]&apos; do simulador é proibida pelo sistema de permissões.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Você não pode salvar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Não é possível salvar sua seleção porque o objeto &apos;[OBJ_NAME]&apos; não é copiável.
+	</notification>
+	<notification name="NoModNoTaking">
+		Você não pode levar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Erro interno: tipo de destino desconhecido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		A exclusão falhou porque o objeto não foi encontrado
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Não é possível expulsar esse usuário.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posição de início definida.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		A expulsão falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Você não está autorizado a modificar este objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Não é possível ativar propriedades físicas para objetos keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Não é possível adicionar item!
+	</notification>
+	<notification name="UnableEditItem">
+		Não é possível editar isso!
+	</notification>
+	<notification name="NoPermToEdit">
+		Não é permitido editar isso.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Não é permitido copiar esse inventário.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Não é possível salvar no conteúdo do objeto: O item não existe mais.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Muitos scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Não é possível adicionar script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Servidor de objetos não respondeu a tempo.  Objeto retornado a sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta região não tem formas físicas ativadas.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Você não pode modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Não é possível definir as propriedades físicas neste tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Não é possível definir que um prim raiz não tenha forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta região não tem materiais físicos ativados.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Apenas prims raiz podem ter seus materiais físicos ajustados.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Ainda não há suporte para a configuração dos materiais físicos em personagens.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Uma ou mais das propriedades do material físico são inválidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Você não pode alterar o tipo de acabamento de um objeto mesh.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Você não pode alterar a forma de um objeto mesh
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Você não pode entrar nesta região porque \nela está cheia.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Falha na vinculação -- proprietários diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Falha na vinculação -- não é possível modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Ocorreu uma falha na vinculação porque você não tem permissão de edição.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Falha na vinculação -- muitos prims
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Falha na vinculação -- nada é vinculável.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Falha na vinculação -- muitos personagens com pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Falha na vinculação -- recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		O objeto usa muitos recursos físicos – sua dinâmica foi desativada.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Você foi teletransportado por um anexo em [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de um usuário desconhecido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Não foi possível criar o objeto solicitado. A região está cheia.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Não é possível anexar vários objetos a um local.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Você não pode criar vários objetos aqui.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Não foi possível criar o objeto solicitado. Tente novamente.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Falha na renderização, objeto solicitado demorou muito a carregar.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Você não pode criar plantas neste terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Não é possível renderizar o objeto porque os dados de mesh são inválidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Não foi possível renderizar objeto porque já há muitos scripts nesta região.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Seus privilégios de acesso não permitem que você crie objetos aqui.
+	</notification>
+	<notification name="CantCreateObject">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parâmetros de objeto inválidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Seus privilégios de acesso não permitem que você duplique objetos aqui.
+	</notification>
+	<notification name="CantChangeShape">
+		Você não está autorizado a alterar essa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Seus privilégios de acesso não permitem que você reivindique objetos aqui.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		A doação falhou porque você não está autorizado a doar objetos ao seu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Seus privilégios de acesso não permitem que você compre objetos aqui.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Não é possível anexar objeto porque um avatar está sentado nele.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Árvores e grama não podem ser usadas como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Não é possível anexar objetos de propriedade de um grupo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Não é possível anexar objetos que não sua propriedade.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Não é possível anexar objetos que contribuem com o navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Não é possível vincular objeto porque você não tem permissão para movê-lo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Falha ao largar anexo: você não está autorizado a largá-lo aqui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Falha ao largar anexo: recursos de terreno disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Falha ao largar anexos: recursos disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Não é possível largar objeto aqui.  O lote está cheio.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Detalhe seus parâmetros de exclusão.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Não é possível carregar objeto.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Não foi possível encontrar usuário para teletransportar para início
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		solicitação de poderes de deus falhou
+	</notification>
+	<notification name="GenericRequestFailed">
+		falha em solicitação genérica
+	</notification>
+	<notification name="CantUploadPostcard">
+		Não foi possível carregar cartão postal.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Não foi possível obter detalhes de inventário para o anúncio de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Não é possível enviar anúncio de grupo -- não permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Não é possível enviar anúncio de grupo -- não foi possível construir inventário.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Não é possível processar o inventário do anúncio.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Falha no envio de terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Arquivo de terreno gravado.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Arquivo de terreno criado, iniciando o download...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno confeccionado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Você precisa atualizar seu visualizador para comprar este lote.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Não é possível comprar, este lote não está à venda.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Não é possível comprar, o preço de venda ou a área do terreno foram alterados.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Você não é o comprador autorizado deste lote.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Você não pode comprar este lote porque já está aguardando aut. de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Não é possível criar objeto aqui porque isso sobrecarregaria o lote.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Não há lotes alugados suficientes na seleção para reunir.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -&gt; Relatar bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		O terreno foi dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Você comprou um passe.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		A região não permite classificados.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Seu passe para este terreno está prestes a expirar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Não há uma superfície adequada para sentar, tente outro local.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Não há espaço para sentar aqui, tente outro local.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		A reivindicação do objeto falhou porque você não tem permissão
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		A reivindicação do objeto falhou porque você não tem L$ suficiente.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Não é possível doar terrenos de propriedade de um grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		A compra do objeto falhou porque você não tem L$ suficientes.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		A compra do inventário falhou porque você não tem L$ suficiente
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Você não tem L $ suficientes para comprar um passe para este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Não é possível comprar passe no momento.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Não é possível criar objeto porque \no lote está cheio.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Não é possível criar marco para o evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Seus poderes de deus rompem o congelamento!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Falha na solicitação de poderes especiais. Essa solicitação foi registrada.
+	</notification>
+	<notification name="ExpireExplanation">
+		O sistema não pode processar sua solicitação no momento. A solicitação expirou.
+	</notification>
+	<notification name="DieExplanation">
+		O sistema não pode processar sua solicitação.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fundos insuficientes para criar prim.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fundos insuficientes para criar objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Redefinir Início pois o Início não era legal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posição de início definida.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Não é possível desrenderizar objeto devido a uma falha de inventário.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Não é possível criar o inventário solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Não é possível criar a pasta de inventário solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		Não é possível criar esse inventário.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Não é possível criar marco.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Não é possível criar roupa agora. Tente novamente em instantes.
+	</notification>
+	<notification name="InventoryNotForSale">
+		O inventário não está à venda.
+	</notification>
+	<notification name="CantFindInvItem">
+		Não é possível encontrar item do inventário.
+	</notification>
+	<notification name="CantFindObject">
+		Não foi possível encontrar objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Transferências de dinheiro para objetos estão desativadas para esta região no momento.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Não foi possível descobrir a quem pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Não é possível dar L$ a objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Falha na criação de inventário de objetos do mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Um erro interno impediu que seu visualizador fosse atualizado corretamente.  O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Não é possível criar grandes prims que interceptam outros jogadores.  Tente novamente quando os outros jogadores tiverem se movido.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo.
+		<usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos.
+		<usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Não foi possível mover arquivos. Caminho anterior restaurado.
+		<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index b444593af8..22eb23ebc5 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
index c5f93d719a..2fcf6b9932 100644
--- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de bloqueados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
-	<button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/>
-	<button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/>
-	<button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrar" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/>
+		<menu_button name="view_btn" tool_tip="Opções de ordenação"/>
+		<menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/>
+		<button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..f56168c962
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(carregando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..74daded58f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/>
+	<icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/>
+	<button name="delete_btn" tool_tip="Remover esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index 19c34d2f10..0490878507 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index f3af15b991..babb48c208 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -14,81 +14,53 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_filtered_friends_msg">
 		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
-	<string name="people_filter_label" value="Filtro de pessoas"/>
-	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
-		<panel label="MEUS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEUS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opções"/>
-				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
-				<button name="activate_btn" tool_tip="Ativar o grupo selecionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
+				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADA" name="blocked_panel">
+			<panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 350d53b81c..baf14c2c23 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<text name="font_size">
-		Tamanho da fonte:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Pequeno" name="radio" value="0"/>
-		<radio_item label="Médio" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
-	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
-	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar MIs em:
-	</text>
-	<text name="requires_restart_label">
-		(Reinicie para ativar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
-		<radio_item label="Janelas separadas" name="radio" value="0"/>
-		<radio_item label="Guias" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Ativar pop-ups de novos bate-papos:
-	</text>
-	<check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/>
-	<check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+		<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamanho da fonte:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeno" name="Small" value="0"/>
+			<item label="Médio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Notificações
+		</text>
+		<text name="friend_ims">
+			MIs de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			MIs de não amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			MIs de conferências:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Bate-papo de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Bate-papo local:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
+			<item label="Nenhum" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Executar som:
+		</text>
+		<check_box label="Nova conversa" name="new_conversation"/>
+		<check_box label="Chamada de voz recebida" name="incoming_voice_call"/>
+		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventário" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Limpar registro..." name="clear_log"/>
+		<button label="Excluir transcrições..." name="delete_transcripts"/>
+		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
+	</panel>
 	<button label="Tradução..." name="ok_btn"/>
 	<button label="Substituição automática..." name="autoreplace_showgui"/>
 	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index c53aa7d5f7..8a0495f9bb 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="(nunca)" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Mensagem do modo ocupado:
+		Resposta de Não perturbe:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 3cfe0fe4f4..f0fd438cef 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Comprar objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index bc72b86020..4bf18aab70 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=pt-BR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -571,8 +571,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AvatarAway">
 		Distante
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		Não perturbe
 	</string>
 	<string name="AvatarMuted">
 		Mudo
@@ -808,6 +808,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ST_NO_JOINT">
 		Não é possível encontrar a raiz (ROOT) ou junção (JOINT).
 	</string>
+	<string name="NearbyChatTitle">
+		Bate-papo local
+	</string>
+	<string name="NearbyChatLabel">
+		(Bate-papo local)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -871,6 +877,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
+	<string name="AgentNameSubst">
+		(Você)
+	</string>
 	<string name="TeleportYourAgent">
 		Teletransportá-lo
 	</string>
@@ -955,18 +964,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="dictionary_files">
 		Dicionários
 	</string>
-	<string name="AvatarSetNotAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		deixar como não ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Deixar como ocupado
-	</string>
 	<string name="shape">
 		Silhueta
 	</string>
@@ -1923,8 +1920,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="PanelContentsNewScript">
 		Novo Script
 	</string>
-	<string name="BusyModeResponseDefault">
-		O residente para o qual escreveu está no modo &apos;ocupado&apos;, ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente ativou o &quot;Não perturbe&quot; e verá sua mensagem mais tarde.
 	</string>
 	<string name="MuteByName">
 		(por nome)
@@ -2037,9 +2034,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Conteúdo
-	</string>
 	<string name="AcquiredItems">
 		Itens adquiridos
 	</string>
@@ -3753,7 +3747,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Região em geral
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visíveis e bate-papo permitido fora deste terreno
+		Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada.
@@ -3830,6 +3824,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Para visualizar esta mensagem, você deve desmarcar &quot;Apenas amigos e grupos podem me ligar ou enviar MIs&quot; em Preferências/Privacidade.
 	</string>
+	<string name="OnlineStatus">
+		Conectado
+	</string>
+	<string name="OfflineStatus">
+		Desconectado
+	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
@@ -3839,6 +3839,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Você entrou na ligação
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Você recusou automaticamente a chamada de voz enquanto &quot;Não perturbe&quot; estava ativado.
+	</string>
 	<string name="name_started_call">
 		[NAME] iniciou uma ligação de voz
 	</string>
@@ -3851,6 +3854,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Saiu da ligação de voz
 	</string>
+	<string name="conference-title">
+		Bate-papo com várias pessoas
+	</string>
 	<string name="conference-title-incoming">
 		Conversa com [AGENT_NAME]
 	</string>
@@ -4726,6 +4732,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Label">
 		Bate-papo
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversas
+	</string>
 	<string name="Command_Compass_Label">
 		Bússola
 	</string>
@@ -4801,6 +4810,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Tooltip">
 		Bater papo com pessoas próximas usando texto
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar com todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bússola
 	</string>
@@ -4930,4 +4942,13 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="UserDictionary">
 		[Usuário]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
new file mode 100644
index 0000000000..090ac7193a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА">
+	<panel name="buttons_panel">
+		<filter_editor label="Фильтр для людей" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
new file mode 100644
index 0000000000..23225fcf56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="РАЗГОВОР:">
+	<floater.string name="Title">
+		РАЗГОВОР: [NAME]
+	</floater.string>
+	<text name="page_label" value="Страница"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
index b147cfa2b3..eba7a19cd4 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/>
+<multi_floater name="floater_im_box" title="ОБЩЕНИЕ">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/>
+					<button name="add_btn" tool_tip="Начать разговор"/>
+					<button name="speak_btn" tool_tip="Разговаривать через микрофон"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/>
+					<text name="stub_textbox">
+						Разговор отображается в отдельном окне.   [secondlife:/// Вернуть.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index 604d9dc6d3..ea110ffb44 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Кому" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/>
+	<floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/>
+	<floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/>
+	<floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/>
+	<floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/>
+	<floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<button name="add_btn" tool_tip="Добавить участника в этот разговор"/>
+				<button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/>
+				<button name="close_btn" tool_tip="Завершить этот разговор"/>
+				<button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Переводить чат" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Кому" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
index 072c20147d..3f61421d0c 100644
--- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		анонимно
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		вызывает.
+		вызывает вас.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		теперь участвует в групповом голосовом чате.
@@ -25,9 +25,9 @@
 		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</floater.string>
 	<text name="question">
-		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
+		Если вы ответите, вы покинете текущий голосовой чат.
 	</text>
-	<button label="Принять" label_selected="Принять" name="Accept"/>
-	<button label="Отклонить" label_selected="Отклонить" name="Reject"/>
-	<button label="Начать IM" name="Start IM"/>
+	<button label="Ответить" label_selected="Ответить" name="Accept"/>
+	<button label="Игнорировать" label_selected="Игнорировать" name="Reject"/>
+	<button label="Открыть IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index fa72df04fd..8faddb1805 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Показать:
 			</text>
-			<check_box label="Мир" name="show_world"/>
+			<check_box label="Тест" name="show_world"/>
 			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
 			<check_box label="Навигационная сетка" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index db37089aeb..a9a21e7d4a 100644
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
-	<check_box initial_value="истина" label="Просмотр вживую" name="apply_immediate_check"/>
+	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5a7e7a7061
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА">
+	<slider label="Голосовой чат" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
index 1eb8a94d7a..d3cef042a3 100644
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА">
+<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
 	<string name="no_voice_effect">
 		(Нет изменения голоса)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
new file mode 100644
index 0000000000..aca6bd518a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА">
+	<slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
index 0332c03a04..b7a32dfd75 100644
--- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Новая одежда" name="COF.Gear.New_Clothes"/>
-	<menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
new file mode 100644
index 0000000000..530b1ea704
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
+	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
+	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Удалить друзей" name="remove_friends"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Блокировать голос" name="block_unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+	<menu_item_call label="Профиль группы" name="group_profile"/>
+	<menu_item_call label="Активировать группу" name="activate_group"/>
+	<menu_item_call label="Покинуть группу" name="leave_group"/>
+	<context_menu label="Параметры модератора" name="Moderator Options">
+		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
+		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/>
+		<menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..3fbffbe038
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Голосовой вызов..." name="Call"/>
+	<menu_item_call label="Открыть журнал чата..." name="Chat history"/>
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="Invite"/>
+	<menu_item_call label="Карта" name="Map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Черный список" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..928146e273
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по дате" name="sort_by_date"/>
+	<menu_item_check label="Сначала друзья" name="sort_by_friends"/>
+	<menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
new file mode 100644
index 0000000000..1db0b8bae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Добавить друга" name="Add Friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Блокировать голос" name="Block/Unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..35cff8e4bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Компактный вид" name="compact_view"/>
+	<menu_item_check label="Развернутый вид" name="expanded_view"/>
+	<menu_item_check label="Показать время" name="IMShowTime"/>
+	<menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 6229b2e72f..0c50abcfbd 100644
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Профиль объекта..." name="Object Profile"/>
 	<menu_item_call label="Блокировать..." name="Block"/>
+	<menu_item_call label="Показать на карте" name="show_on_map"/>
+	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index 93dbd7d6a7..d379a17216 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Новые волосы" name="New Hair"/>
 		<menu_item_call label="Новые глаза" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Открыть все папки" name="expand"/>
+	<menu_item_call label="Закрыть все папки" name="collapse"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
 	<menu_item_call label="Удалить костюм" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
new file mode 100644
index 0000000000..851a42d428
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/>
+	<menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/>
+	<menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/>
+	<menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/>
+	<menu_item_call label="Изменить настройки..." name="chat_preferences"/>
+	<menu_item_call label="Настройки приватности..." name="privacy_preferences"/>
+	<menu_item_check label="Журнал разговора..." name="Conversation"/>
+	<menu_item_check label="Перевести локальный чат" name="Translate_chat"/>
+	<menu_item_check label="Настройки перевода..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..157f2ad5e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Разблокировать" name="unblock"/>
+	<menu_item_call label="Профиль…" name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..f42e8f8609
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/>
+	<menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..8c0150e8ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по типу" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
new file mode 100644
index 0000000000..7b2dba0539
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
+	<menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
index e734a83ef0..78d73c9d1e 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Информация" name="View Info"/>
 	<menu_item_call label="Чат" name="Chat"/>
-	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Голосовой вызов" name="Call"/>
 	<menu_item_call label="Активация" name="Activate"/>
 	<menu_item_call label="Покинуть" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
new file mode 100644
index 0000000000..cbf1c64774
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index ebce959044..d05b7e7d01 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="В друзья" name="Add Friend"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Карта" name="Map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Черный список" name="Block/Unblock"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Посмотреть журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Черный список" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
index 0e8e0d4053..88eb56c9f5 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Добавить в друзья" name="Add Friends"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить в друзья" name="add_friends"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Звонок" name="call"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..2bc353ad58
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Смотреть карту" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a009cf081f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по времени" name="sort_most"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 0ba3ee152a..230d049fad 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать профиль жителя" name="show_agent"/>
+	<menu_item_call label="Смотреть профиль" name="show_agent"/>
+	<menu_item_call label="Отправить сообщение..." name="send_im"/>
+	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 6e7800d3f5..1326db708e 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать информацию об объекте" name="show_object"/>
+	<menu_item_call label="Профиль объекта..." name="show_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index c292b8a287..92a9943b93 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Статус" name="Status">
-			<menu_item_call label="Нет на месте" name="Set Away"/>
-			<menu_item_call label="Не беспокоить" name="Set Busy"/>
-		</menu>
+		<menu label="Статус" name="Status"/>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
 		<menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
-		<menu_item_check label="Чат..." name="Nearby Chat"/>
+		<menu_item_check label="Разговоры..." name="Conversations"/>
+		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
-		<menu_item_check label="Настройки голоса..." name="Nearby Voice"/>
-		<menu_item_check label="Изменение голоса..." name="ShowVoice"/>
+		<menu label="Изменение голоса" name="VoiceMorphing">
+			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
+			<menu_item_check label="Просмотр..." name="Preview"/>
+			<menu_item_call label="Подписаться..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Жесты..." name="Gestures"/>
-		<menu_item_call label="Друзья" name="My Friends"/>
-		<menu_item_call label="Группы" name="My Groups"/>
-		<menu_item_call label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_check label="Друзья" name="My Friends"/>
+		<menu_item_check label="Группы" name="My Groups"/>
+		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
 		<menu_item_call label="Черный список" name="Block List"/>
 	</menu>
 	<menu label="Мир" name="World">
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 85b7074253..00ab0b5763 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -516,6 +516,24 @@
 		</url>
 		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=ru-ru
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -1546,10 +1564,13 @@ http://secondlife.com/download.
 		Сейчас невозможно предложить дружбу. Повторите попытку через минуту.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Установлен режим «Занят».
-Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину.
-		<usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Режим «Не беспокоить» включен.  Вы не будете получать уведомлений о входящих вызовах.
+
+- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки &gt; Общие).
+- Предложения телепортации будут отклоняться.
+- Голосовые вызовы будут отклоняться.
+		<usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение.
@@ -2033,6 +2054,10 @@ http://secondlife.com/download.
 		Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта?
 		<usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		При добавлении участника в существующий разговор будет создан новый разговор.  Все участники получат уведомления о новом разговоре.
+		<usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Выйти из программы?
 		<usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/>
@@ -2107,14 +2132,14 @@ http://secondlife.com/download.
 			<button ignore="Не заменять" name="No" text="Отмена"/>
 		</form>
 	</notification>
-	<notification label="Предупреждение о режиме «Занят»" name="BusyModePay">
-		У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж.
+	<notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay">
+		Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж.
 
-Хотите отключить режим «Занят» до завершения этой транзакции?
+Отключить режим «Не беспокоить» перед завершением этой операции?
 		<form name="form">
-			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/>
-			<button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/>
-			<button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/>
+			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/>
+			<button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/>
+			<button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ http://secondlife.com/download.
 	<notification name="GroupNotice">
 		Раздел: [SUBJECT], сообщение: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; в сети
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; не в сети
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Вы лучше всех, но нельзя добавить в друзья себя самого.
@@ -2482,13 +2504,6 @@ http://secondlife.com/download.
 	<notification name="DynamicPathfindingDisabled">
 		В этом регионе не разрешен динамический поиск пути.  Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов.  Чтобы исправить их поведение, нажмите кнопку «Восстановить регион».  Более подробная информация – по ссылке «Справка».
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Справка" ignoretext="Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов." name="okhelpignore" yestext="OK"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Произошла ошибка.  Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство.  Иногда для устранения этой проблемы достаточно выйти и снова войти.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2766,7 @@ http://secondlife.com/download.
 	<notification name="ScriptQuestionCaution">
 		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
   
-Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
+Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
 			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
@@ -3333,4 +3348,632 @@ http://secondlife.com/download.
 		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
 		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Аватар заморожен.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] разморозил вас.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Аватар разморожен.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Не удалось заморозить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Заморозка кончилась, занимайтесь своим делом.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Невозможно заморозить этого пользователя.
+	</notification>
+	<notification name="NowOwnObject">
+		Вы стали владельцем объекта [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли.  Узнать, кто владелец, можно с помощью инструмента «Земля».
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Невозможно выложить объект: слишком много запросов.
+	</notification>
+	<notification name="SitFailCantMove">
+		Нельзя сесть: сейчас вы не можете двигаться.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Вам не разрешено садиться на этой земле.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Попробуйте переместиться ближе.  Нельзя сесть на объект:
+он находится в другом регионе.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Невозможно создать новый объект. Регион уже заполнен.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Вы не можете создавать деревья и траву на чужой земле.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Выбран дубликат без корневых объектов.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Невозможно дублировать объекты: регион заполнен.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Невозможно дублировать объекты: не удалось найти их участок.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Нельзя создать объект: 
+участок уже заполнен.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Не удалось выложить объект.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Невозможно создать элемент, который вызвал проблемы в этом регионе.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Этот предмет инвентаря находится в черном списке.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Поиск по земле заблокирован.
+Вы провели слишком много операций поиска за короткое время.
+Повторите попытку через минуту.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Вы умерли и были телепортированы в ваше домашнее местоположение
+	</notification>
+	<notification name="EjectComingSoon">
+		Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Вам нет доступа в этот регион: 
+серпер переполнен.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Сохранение в инвентаре отключено.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]».
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется.
+	</notification>
+	<notification name="NoModNoTaking">
+		Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="RezDestInternalError">
+		Внутренняя ошибка: неизвестный тип места назначения.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Невозможно удалить: объект не найден
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Невозможно выбросить этого пользователя.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="HomePositionSet">
+		Задано положение дома.
+	</notification>
+	<notification name="AvatarEjected">
+		Аватар выброшен.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Не удалось выбросить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		У вас нет прав на изменение этого объекта
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Нельзя включить физику для объекта, который относится к навигационной сетке.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Нельзя включить физику для объектов с ключевыми кадрами.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Нельзя включить физику для объекта -- недостаточно земельных ресурсов.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке.
+	</notification>
+	<notification name="UnableAddItem">
+		Невозможно добавить предмет!
+	</notification>
+	<notification name="UnableEditItem">
+		Редактирование невозможно!
+	</notification>
+	<notification name="NoPermToEdit">
+		Редактирование не разрешено.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Не разрешено копировать этот инвентарь.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Нельзя сохранить в содержимом объекта: предмет уже не существует.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта.
+	</notification>
+	<notification name="TooManyScripts">
+		Слишком много скриптов.
+	</notification>
+	<notification name="UnableAddScript">
+		Невозможно добавить скрипт!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Сервер активов не ответил в заданное время.  Объект возвращен в симулятор.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		В этом регионе не разрешены фигуры с физическими данными.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Нельзя задать свойства физики для объекта этого типа.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Нельзя задать корневой примитив без фигуры.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		В этом регионе не разрешены материалы с физическими данными.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Настройка материалов с физическими данными разрешена только для корневых примитивов.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Присвоение персонажам материалов с физическими данными еще не поддерживается.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Одно или несколько свойств указанного материала с физическими данными недопустимы.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Не разрешается изменять тип стыковки меш-объекта.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Не разрешается изменять форму меш-объекта
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Вам нет доступа в этот регион: \nрегион заполнен.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Связь невозможна -- разные владельцы
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Связь невозможна – нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Связь невозможна: у вас нет разрешения на редактирование.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Связь невозможна -- слишком много примитивов
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Связь невозможна -- нельзя связать некопируемый и непереносимый объекты
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Связь невозможна -- нет связываемых объектов.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Связь невозможна -- слишком много персонажей с поиском пути
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Связь невозможна -- недостаточно земельных ресурсов
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Объект использует слишком много ресурсов физики -- динамическое поведение отключено.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]»
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Вы были телепортированы прикрепленным объектом [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Невозможно создать запрошенный объект. Регион уже заполнен.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Нельзя присоединить несколько объектов к одной точке.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Здесь нельзя создать несколько объектов.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Невозможно создать запрошенный объект. Объекта нет в базе данных.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Невозможно создать запрошенный объект. Повторите попытку.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Не удалось выложить, загрузка нужного объекта длится слишком долго.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Вам нельзя создавать растения на этой земле.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Невозможно восстановить объект. Не найдена позиция в игровом мире.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Невозможно выложить объект: его данные сетки неверны.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Невозможно выложить объект: в этом регионе уже сликом много скриптов.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ваши привилегии доступа не разрешают создание объектов на этом месте.
+	</notification>
+	<notification name="CantCreateObject">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Неверные параметры объекта
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ваши привилегии доступа не разрешают дублирование объектов на этом месте.
+	</notification>
+	<notification name="CantChangeShape">
+		Вам не разрешено изменять эту фигуру.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ваши привилегии доступа не разрешают претендовать на объекты на этом месте.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Не удалось передать: вам не разрешено передавать объекты для этой группы.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ваши привилегии доступа не разрешают покупать объекты на этом месте.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Невозможно присоединить объект: на нем сидит аватар.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Деревья и траву нельзя носить как прикрепленные объекты.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Нельзя присоединять объекты, принадлежащие группе.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Нельзя прикреплять объекты, которыми вы не владеете.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Невозможно присоединить объекты, которые относятся к навигационной сетке.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Нельзя присоединить объект: вам не разрешено его перемещать.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Нельзя сбросить объект здесь.  Участок уже заполнен.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Нельзя коснуться/взять этот объект: вы забанены на этом участке.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Уточните параметры удаления.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Невозможно отправить актив.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Не удалось найти пользователя для телепортации домой
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		режим творца недоступен
+	</notification>
+	<notification name="GenericRequestFailed">
+		не удалось выполнить общий запрос
+	</notification>
+	<notification name="CantUploadPostcard">
+		Невозможно отправить открытку.  Повторите попытку позже.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Невозможно получить данные инвентаря для группового уведомления.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Невозможно отправить групповое уведомление -- не разрешено.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Невозможно отправить групповое уведомление -- не удалось собрать инвентарь.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Невозможно проанализировать инвентарь, указанный в уведомлении.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Не удалось загрузить ландшафт.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Файл ландшафта записан.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Файл ландшафта записан, начинается загрузка...
+	</notification>
+	<notification name="TerrainBaked">
+		Ландшафт готов.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Для покупки этого участка необходимо обновить клиент.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Невозможно купить, этот участок не предназначен для продажи.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Невозможно купить: цена или площадь земли изменились.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Вам не разрешено покупать этот участок.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Здесь нельзя создавать объекты – участок будет переполнен.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Выбрано недостаточно арендуемых участков для вступления.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -&gt; Сообщить об ошибке...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Земля разделена.
+	</notification>
+	<notification name="PassPurchased">
+		Вы приобрели пропуск.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		В регионе не разрешены рекламные объявления.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ваш пропуск на эту землю скоро закончится.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Здесь нет места, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Невозможно претендовать на объект: у вас нет разрешения
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Невозможно претендовать на объект: у вас не хватает L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Нельзя передать землю, принадлежащую группе.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Не удалось купить объект: у вас не хватает L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Не удалось купить инвентарь: у вас не хватает L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		У вас недостаточно L$, чтобы заплатить за проход на эту землю.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Сейчас нельзя купить пропуск.  Повторите попытку позже.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Невозможно создать объект:\nучасток заполнен.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Невозможно создать закладку для события.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Сила творца одолевает заморозку!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Не удалось выполнить запрос на особые способности. Запрос зарегистрирован.
+	</notification>
+	<notification name="ExpireExplanation">
+		Система сейчас не может обработать ваш запрос. Истекло время запроса.
+	</notification>
+	<notification name="DieExplanation">
+		Система не может обработать ваш запрос.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Недостаточно денег для создания примитива.
+	</notification>
+	<notification name="RezObjectFailure">
+		Недостаточно денег для создания объекта.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Недопустимое домашнее местоположение; восстановлено стандартное местоположение.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="SetHomePosition">
+		Домашнее местоположение задано.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Невозможно забрать объект: сбой инвентаря.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Невозможно создать требуемый инвентарь.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Невозможно создать требуемую папку инвентаря.
+	</notification>
+	<notification name="CantCreateInventory">
+		Невозможно создать этот инвентарь.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Невозможно создать закладку.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Сейчас нельзя создать костюм. Попробуйте через минуту.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Инвентарь не для продажи.
+	</notification>
+	<notification name="CantFindInvItem">
+		Не удалось найти предмет из инвентаря.
+	</notification>
+	<notification name="CantFindObject">
+		Не удалось найти объект.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Сейчас в этом регионе запрещен перевод денег на объекты.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Непонятно, кому платить.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Нельзя отдавать L$ за общедоступные объекты.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Не удалось создать инвентарь в объекте игрового мира.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Не удалось обновить клиент из-за внутренней ошибки.  Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Нельзя создавать большие примитивы, которые пересекаются с другими игроками.  Повторите попытку, когда другие игроки уйдут.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов.
+		<usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены.
+		<usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Невозможно переместить файлы. Восстановлен прежний путь.
+		<usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
index 75e396222f..4866bb7ed6 100644
--- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/>
 	<icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/>
 	<icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
index 214ca8bf3a..70a1b25996 100644
--- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Черный список
-	</text>
-	<scroll_list name="blocked" tool_tip="Список заблокированных жителей"/>
-	<button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/>
-	<button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/>
-	<button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Фильтр" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/>
+		<menu_button name="view_btn" tool_tip="Параметры сортировки"/>
+		<menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/>
+		<button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Список заблокированных жителей"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..4fdb4f9122
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(загрузка)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..98fe7b99be
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Включая голосовой чат"/>
+	<icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/>
+	<button name="delete_btn" tool_tip="Удалить эту запись"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index 7f000fb5a0..b043ffbbe2 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 607921f2d6..7da7fb3191 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском].
 	</string>
-	<string name="people_filter_label" value="Фильтр для людей"/>
-	<string name="groups_filter_label" value="Фильтр для групп"/>
 	<string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/>
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
-	<filter_editor label="Фильтр" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
-		<panel label="МОИ ДРУЗЬЯ" name="friends_panel">
+		<panel label="ДРУЗЬЯ" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Предложить жителю дружбу"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="МОИ ГРУППЫ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Опции"/>
-				<button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
-				<button name="activate_btn" tool_tip="Активировать выбранную группу"/>
+		<panel label="ГРУППЫ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Фильтр для групп" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/>
+				<menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
+				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
 			</panel>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
+		<panel label="БЛОКИРОВАН" name="blocked_panel">
+			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 9283fc9e6e..6383fc8c2c 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<text name="font_size">
-		Размер шрифта:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Мелкий" name="radio" value="0"/>
-		<radio_item label="Средний" name="radio2" value="1"/>
-		<radio_item label="Крупный" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
-	<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
-	<check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/>
-	<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Показывать сообщения:
-	</text>
-	<text name="requires_restart_label">
-		(требуется перезапуск)
-	</text>
-	<radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)">
-		<radio_item label="В отдельных окнах" name="radio" value="0"/>
-		<radio_item label="На вкладках" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Включить всплывающие сообщения с новыми репликами в чате:
-	</text>
-	<check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/>
-	<check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/>
-	<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
-	<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
+		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Размер шрифта:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Мелкий" name="Small" value="0"/>
+			<item label="Средний" name="Medium" value="1"/>
+			<item label="Крупный" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Уведомления
+		</text>
+		<text name="friend_ims">
+			IM друзей:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			IM чужих:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="conference_ims">
+			IM конференции:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="group_chat">
+			Групповой чат:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Локальный чат:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
+			<item label="Нет" name="None" value="нет"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Звук:
+		</text>
+		<check_box label="Новый разговор" name="new_conversation"/>
+		<check_box label="Входящий голосовой вызов" name="incoming_voice_call"/>
+		<check_box label="Предложение телепортации" name="teleport_offer"/>
+		<check_box label="Предложение инвентаря" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Очистить журнал..." name="clear_log"/>
+		<button label="Удалить записи..." name="delete_transcripts"/>
+		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
+	</panel>
 	<button label="Перевод..." name="ok_btn"/>
 	<button label="Автозамена..." name="autoreplace_showgui"/>
 	<button label="Проверка правописания..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index d1bfedf2d8..c7a850f78a 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Ответ в режиме «Занят»:
+		Ответ в режиме «Не беспокоить»:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index e9dd3760b5..5502530ca4 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Купить объект" name="Buyobject"/>
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
+			<combo_box.item label="Приблизить" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index f9ded799bf..d7d4df4a37 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ru-RU&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
@@ -619,7 +619,7 @@ support@secondlife.com.
 	<string name="AvatarAway">
 		Нет на месте
 	</string>
-	<string name="AvatarBusy">
+	<string name="AvatarDoNotDisturb">
 		Не беспокоить
 	</string>
 	<string name="AvatarMuted">
@@ -856,6 +856,12 @@ support@secondlife.com.
 	<string name="ST_NO_JOINT">
 		Не удается найти объект ROOT или JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Локальный чат
+	</string>
+	<string name="NearbyChatLabel">
+		(Локальный чат)
+	</string>
 	<string name="whisper">
 		шепчет:
 	</string>
@@ -919,12 +925,15 @@ support@secondlife.com.
 	<string name="ControlYourCamera">
 		Управлять камерой
 	</string>
-	<string name="TeleportYourAgent">
-		Телепортировать вас
-	</string>
 	<string name="NotConnected">
 		Нет подключения
 	</string>
+	<string name="AgentNameSubst">
+		(Вы)
+	</string>
+	<string name="TeleportYourAgent">
+		Телепортировать вас
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -1006,18 +1015,6 @@ support@secondlife.com.
 	<string name="dictionary_files">
 		Словари
 	</string>
-	<string name="AvatarSetNotAway">
-		На месте
-	</string>
-	<string name="AvatarSetAway">
-		Нет на месте
-	</string>
-	<string name="AvatarSetNotBusy">
-		Не занят(а)
-	</string>
-	<string name="AvatarSetBusy">
-		Не беспокоить
-	</string>
 	<string name="shape">
 		Фигура
 	</string>
@@ -1986,8 +1983,8 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		Новый скрипт
 	</string>
-	<string name="BusyModeResponseDefault">
-		У адресата вашего сообщения задан статус «Не беспокоить».  Ваше сообщение все равно будет отображено на панели IM для просмотра позже.
+	<string name="DoNotDisturbModeResponseDefault">
+		Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже.
 	</string>
 	<string name="MuteByName">
 		(по имени)
@@ -2100,9 +2097,6 @@ support@secondlife.com.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Контент
-	</string>
 	<string name="AcquiredItems">
 		Купленные вещи
 	</string>
@@ -3871,7 +3865,7 @@ support@secondlife.com.
 		Область общей дозволенности
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Все жители с других участков могут видеть аватары и общаться в чате
+		Аватары на этом участке невидимы и неслышимы для аватаров с других участков
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
@@ -3948,6 +3942,12 @@ support@secondlife.com.
 	<string name="IM_unblock_only_groups_friends">
 		Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность».
 	</string>
+	<string name="OnlineStatus">
+		Онлайн
+	</string>
+	<string name="OfflineStatus">
+		Оффлайн
+	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
 	</string>
@@ -3957,6 +3957,9 @@ support@secondlife.com.
 	<string name="you_joined_call">
 		Вы присоединились к голосовой беседе
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить».
+	</string>
 	<string name="name_started_call">
 		Житель [NAME] начал голосовую беседу
 	</string>
@@ -3973,7 +3976,7 @@ support@secondlife.com.
 		Соединяется...
 	</string>
 	<string name="conference-title">
-		Спонтанная конференция
+		Чат с несколькими участниками
 	</string>
 	<string name="conference-title-incoming">
 		Конференция с жителем [AGENT_NAME]
@@ -4865,6 +4868,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Label">
 		Чат
 	</string>
+	<string name="Command_Conversations_Label">
+		Разговоры
+	</string>
 	<string name="Command_Compass_Label">
 		Компас
 	</string>
@@ -4940,6 +4946,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Tooltip">
 		Обменивайтесь текстовыми репликами с людьми вокруг вас
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Поговорить со всеми
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Компас
 	</string>
@@ -5069,4 +5078,13 @@ support@secondlife.com.
 	<string name="UserDictionary">
 		[Пользователь]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
new file mode 100644
index 0000000000..5f8dac506f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ">
+	<panel name="buttons_panel">
+		<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..84403dfd68
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="KONUŞMA:">
+	<floater.string name="Title">
+		KONUŞMA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Sayfa"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
index 4451d1d309..6504430b3c 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="SOHBETLER"/>
+<multi_floater name="floater_im_box" title="SOHBETLER">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+					<button name="add_btn" tool_tip="Yeni bir sohbet başlat"/>
+					<button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/>
+					<text name="stub_textbox">
+						Sohbet ayrı bir pencerede.   [secondlife:/// Bunu geri getir.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index bed08b36c6..8ce8f0fe13 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Kime" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/>
+	<floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/>
+	<floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/>
+	<floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<button name="add_btn" tool_tip="Bu sohbete birini ekle"/>
+				<button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/>
+				<button name="close_btn" tool_tip="Bu sohbeti bitir"/>
+				<button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Kime" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
index adb03c2dff..0f2b27241e 100644
--- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonim
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		arıyor.
+		sizi arıyor.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		bir Sesli Sohbet aramasına bir konferans araması ile katıldı.
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
+		Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek.
 	</text>
-	<button label="Kabul Et" label_selected="Kabul Et" name="Accept"/>
-	<button label="Reddet" label_selected="Reddet" name="Reject"/>
-	<button label="Aİ Başlat" name="Start IM"/>
+	<button label="Yanıtla" label_selected="Yanıtla" name="Accept"/>
+	<button label="Yok say" label_selected="Yok say" name="Reject"/>
+	<button label="Bunun yerine Aİ aç" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 6eecc7fb77..35f47e6dfa 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Göster:
 			</text>
-			<check_box label="Dünya" name="show_world"/>
+			<check_box label="Test" name="show_world"/>
 			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
 			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 889425f23a..42483c09e1 100644
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
 	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
-	<check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Önizleme Devre Dışı"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..ec350bee60
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ">
+	<slider label="Sesli Sohbet" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
index 3534a3fe90..7a157244cd 100644
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME">
+<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
 	<string name="no_voice_effect">
 		(Ses Şekillendirme Yok)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
new file mode 100644
index 0000000000..acf99d6199
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="SES DÜZEYİ">
+	<slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
index f910e1fe91..9480d30029 100644
--- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/>
-	<menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
new file mode 100644
index 0000000000..31404f2501
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
+	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
+	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Arkadaş ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Arkadaşları çıkar" name="remove_friends"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Sesi Engelle" name="block_unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+	<menu_item_call label="Grup Profili" name="group_profile"/>
+	<menu_item_call label="Grubu Etkinleştir" name="activate_group"/>
+	<menu_item_call label="Gruptan Ayrıl" name="leave_group"/>
+	<context_menu label="Moderatör Seçenekleri" name="Moderator Options">
+		<menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/>
+		<menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/>
+		<menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..9e91780eb8
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="Aİ..." name="IM"/>
+	<menu_item_call label="Sesli arama..." name="Call"/>
+	<menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/>
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="Invite"/>
+	<menu_item_call label="Harita" name="Map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..9a77eaadd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Tarihe göre sırala" name="sort_by_date"/>
+	<menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/>
+	<menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
new file mode 100644
index 0000000000..3b9738edce
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Sesi Engelle" name="Block/Unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..c4d4357ac9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Daraltılmış görünüm" name="compact_view"/>
+	<menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/>
+	<menu_item_check label="Zamanı göster" name="IMShowTime"/>
+	<menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 34a2661d8a..3d5c68d9d3 100644
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Nesne Profili..." name="Object Profile"/>
 	<menu_item_call label="Engelle..." name="Block"/>
+	<menu_item_call label="Haritada Göster" name="show_on_map"/>
+	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index d2e7e7107a..674041e9c9 100644
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Yeni Saç" name="New Hair"/>
 		<menu_item_call label="Yeni Gözler" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Tüm klasörleri genişlet" name="expand"/>
+	<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
 	<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
 	<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
new file mode 100644
index 0000000000..e9411ff350
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/>
+	<menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/>
+	<menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/>
+	<menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/>
+	<menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/>
+	<menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/>
+	<menu_item_check label="Sohbet günlüğü..." name="Conversation"/>
+	<menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/>
+	<menu_item_check label="Çeviri ayarları..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..2bf1101b48
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a869e2ae7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/>
+	<menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..14b3de3a9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Türe göre sırala" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..609584d6a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
+	<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
index 9f2946e310..743b01844d 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Bilgileri Görüntüle" name="View Info"/>
 	<menu_item_call label="Sohbet" name="Chat"/>
-	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Sesli arama" name="Call"/>
 	<menu_item_call label="Etkinleştir" name="Activate"/>
 	<menu_item_call label="Ayrıl" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..e550b20add
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index ee859a9450..2d61461c91 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Harita" name="Map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
index 5c89f87906..20695d98e8 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Arkadaş Ekle" name="Add Friends"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friends"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Ara" name="call"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..59ea7c145f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Haritayı Göster" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..02be715ed2
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index d82b52aea8..b14a0509bf 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Sakin Profilini Göster" name="show_agent"/>
+	<menu_item_call label="Profili Göster" name="show_agent"/>
+	<menu_item_call label="Aİ Gönder..." name="send_im"/>
+	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index d55e34c11c..00fa3c27c2 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/>
+	<menu_item_call label="Nesne Profili..." name="show_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 28f28db6d2..6ec5e6d7a3 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Durum" name="Status">
-			<menu_item_call label="Uzakta" name="Set Away"/>
-			<menu_item_call label="Meşgul" name="Set Busy"/>
-		</menu>
+		<menu label="Durum" name="Status"/>
 		<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="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
-		<menu_item_check label="Sohbet..." name="Nearby Chat"/>
+		<menu_item_check label="Sohbetler..." name="Conversations"/>
+		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
-		<menu_item_check label="Ses ayarları..." name="Nearby Voice"/>
-		<menu_item_check label="Ses şekillendirme..." name="ShowVoice"/>
+		<menu label="Ses şekillendirme" name="VoiceMorphing">
+			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
+			<menu_item_check label="Önizleme..." name="Preview"/>
+			<menu_item_call label="Abone ol..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
-		<menu_item_call label="Arkadaşlar" name="My Friends"/>
-		<menu_item_call label="Gruplar" name="My Groups"/>
-		<menu_item_call label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_check label="Arkadaşlar" name="My Friends"/>
+		<menu_item_check label="Gruplar" name="My Groups"/>
+		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
 		<menu_item_call label="Engelleme Listesi" name="Block List"/>
 	</menu>
 	<menu label="Dünya" name="World">
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 488702f9ca..ad92a4b478 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -516,6 +516,24 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -1546,10 +1564,13 @@ Gruptan ayrılmak istiyor musunuz?
 		Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Durumunuz Meşgul olarak ayarlandı.
-Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek.
-		<usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/>
+	<notification name="DoNotDisturbModeSet">
+		Rahatsız Etme açık.  Gelen iletişimlerle ilgili size bilgi verilmeyecek.
+
+- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler &gt; Genel içerisinde ayarlanır).
+- Işınlanma teklifleri reddedilecektir.
+- Sesli aramalar reddedilecektir.
+		<usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin.
@@ -2033,6 +2054,10 @@ Envanter öğesi/öğeleri taşınsın mı?
 		Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz?
 		<usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur.  Tüm katılımcılara yeni sohbet bildirimi gönderilir.
+		<usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/>
@@ -2107,14 +2132,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
 			<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
 		</form>
 	</notification>
-	<notification label="Meşgul Durumu Uyarısı" name="BusyModePay">
-		Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir.
+	<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
+		Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
 
-Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz?
+Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
 		<form name="form">
-			<ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/>
-			<button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/>
-			<button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/>
+			<ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/>
+			<button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/>
+			<button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2249,11 +2274,8 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 	<notification name="GroupNotice">
 		Konu: [SUBJECT], İleti: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimiçi
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimdışı
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; durumu: [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz.
@@ -2482,13 +2504,6 @@ Burada uçamazsınız.
 	<notification name="DynamicPathfindingDisabled">
 		Bu bölgede dinamik yol bulma etkin değil.  Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir.  Hareket eden başka nesnelerin doğru davranmasını sağlamak için “Bölgeyi yeniden kaydet” düğmesine tıklayın.  Daha fazla bilgi edinmek için “Yardım” seçimini yapın.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="Yardım" ignoretext="Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir." name="okhelpignore" yestext="Tamam"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Bir hata meydana geldi.  Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz.  Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer.
 		<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2751,7 +2766,7 @@ Kabul ediyor musunuz?
 	<notification name="ScriptQuestionCaution">
 		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
   
-Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
+Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
 			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
@@ -3333,4 +3348,626 @@ Girişim iptal edildi.
 		[NUM_ITEMS] öğeyi siliyorsunuz.  Devam etmek istediğinize emin misiniz?
 		<usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar donduruldu.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] sizin dondurulmanızı kaldırdı.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar artık dondurulmuş değil.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Üzgünüz, bu kullanıcı dondurulamaz.
+	</notification>
+	<notification name="NowOwnObject">
+		Artık [OBJECT_NAME] nesnesinin sahibisiniz
+	</notification>
+	<notification name="CantRezOnLand">
+		[OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor.  Arazinin sahibini görmek için arazi aracını kullanın.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Çok fazla talep olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="SitFailCantMove">
+		Oturamazsınız çünkü şu anda hareket edemezsiniz.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Oturamazsınız çünkü bu araziye girme izniniz yok.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Daha yakına gelmeyi deneyin.  Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Yeni nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesi size aktarılamadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi navmesh&apos;e katkıda bulunduğu için kopyalama başarılamadı.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Kök nesne seçili olmayan kopya.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Nesneler çoğaltılamıyor çünkü bölge dolu.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Nesne oluşturulamıyor çünkü
+parsel dolu.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Bir nesneyi oluşturma girişimi başarısız oldu.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Bu envanter öğesi kara listeye alınmış.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Arazi Arama Engellendi.
+Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz.
+Lütfen bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız
+	</notification>
+	<notification name="EjectComingSoon">
+		Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Bu bölgeye giremezsiniz çünkü 
+sunucu dolu.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Envantere Geri Kaydet devre dışı bırakıldı.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		&apos;[DEST_NAME]&apos; nesnesini değiştirme izniniz olmadığı için &apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		&apos;[OBJ_NAME]&apos; envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoTransNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Benzeticiden &apos;[OBJ_NAME]&apos; nesnesinin kaldırılmasına izinler sistemi izin vermiyor.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoModNoTaking">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız.
+	</notification>
+	<notification name="RezDestInternalError">
+		Dahili Hata: Bilinmeyen hedef türü.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Nesne bulunamadığı için silme başarılamadı
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Üzgünüz, bu kullanıcı çıkartılamaz.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="HomeLocationLimits">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="HomePositionSet">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar çıkartıldı.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh&apos;i bölge sınırları ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Bu nesneyi değiştirme izniniz yok
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Navmesh&apos;e katkıda bulunan bir nesne için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Anahtar karelenmiş nesneler için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Fizik kaynağı maliyeti [MAX_OBJECTS]&apos;dan büyük nesne için fizik etkinleştirilemedi
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Bu nesne fantom olduğu ve navmesh&apos;e katkıda bulunduğu için konkav bir parçaya sahip olamaz.
+	</notification>
+	<notification name="UnableAddItem">
+		Öğe eklenemedi!
+	</notification>
+	<notification name="UnableEditItem">
+		Bu düzenlenemiyor!
+	</notification>
+	<notification name="NoPermToEdit">
+		Bunu düzenleme izni yok.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Bu envanteri kopyalama izni yok.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
+	</notification>
+	<notification name="TooManyScripts">
+		Çok fazla komut dosyası.
+	</notification>
+	<notification name="UnableAddScript">
+		Komut dosyası eklenemedi!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Varlık sunucusu zamanında yanıt vermedi.  Nesne sime iade edildi.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Bu bölgede fiziksel şekiller etkin değil.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Bu nesne türü üzerinde fizik özellikleri ayarlanamaz.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Kök prim şekilsiz olacak şekilde ayarlanamaz.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Bu bölgede fiziksel malzemeler etkin değil.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Sadece kök primlerin fizik malzemeleri ayarlanabilir.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Bir örgü nesnesinin dikiş türünü değiştiremezsiniz.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Bir örgü nesnesinin şeklini değiştiremezsiniz
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Bu bölgeye giremezsiniz çünkü \nbölge dolu.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Bağlantı başarısız oldu -- sahipler farklı
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Bağlntı başarılamadı -- navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Bağlantı başarısız oldu -- çok fazla ilkel öğe var
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Bağlantı başarısız oldu -- arazi kaynakları yetersiz
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		&apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedByAttachment">
+		You have been teleported by an attachment on [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Bilinmeyen bir sahibi olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Talep edilen nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Tek bir noktaya birden fazla nesne iliştiremezsiniz.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Burada birden fazla nesne oluşturamazsınız.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Bu arazide bitkiler oluşturamazsınız.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Nesne geri yüklenemiyor. Dünya konumu bulunamadı.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Örgü verileri geçersiz olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor.
+	</notification>
+	<notification name="CantCreateObject">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Geçersiz nesne parametreleri
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor.
+	</notification>
+	<notification name="CantChangeShape">
+		Bu şekli değiştirmenize izin verilmiyor.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Üzerinde bir avatar oturduğu için nesne iliştirilemiyor.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Ağaçlar ve çimen aksesuar olarak giyilemez.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Sahibi grup olan nesneler iliştirilemiyor.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Sahip olmadığınız nesneleri iliştiremezsiniz.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Navmesh&apos;e katkıda bulunan nesneler iliştirilemez.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Aksesuar düşürülemedi: Burada düşürme izniniz yok.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Nesne buraya düşürülemez.  Parsel dolu.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Lütfen silme parametrelerinizi daraltın.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Varlık karşıya yüklenemiyor.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Ana konuma ışınlanacak kullanıcı bulunamadı
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		tanrısal talep başarısız oldu
+	</notification>
+	<notification name="GenericRequestFailed">
+		genel talep başarısız oldu
+	</notification>
+	<notification name="CantUploadPostcard">
+		Posta kartı karşıya yüklenemiyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Grup bildirimi için envanter ayrıntıları alınamadı.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Grup bildirimi gönderilemedi -- izin verilmiyor.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Grup bildirimi gönderilemedi -- envanter oluşturulamadı.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Bildirimde envanter ayrıştırılamadı.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Yüzeyin karşıya yüklemesi başarılamadı.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Yüzey dosyası yazıldı.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor...
+	</notification>
+	<notification name="TerrainBaked">
+		Yüzey kaydedildi.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Satın alınamıyor, bu parsel satılık değil.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Bu parsel için yetkili alıcı değilsiniz.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -&gt; Hata Bildir ile bildirin...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Arazi bölündü.
+	</notification>
+	<notification name="PassPurchased">
+		Bir geçiş hakkı satın aldınız.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Bölgede seri ilanlara izin verilmiyor.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Bu arazi için geçiş hakkınız sona ermek üzere.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Burada oturacak yer yok, başka bir yer deneyin.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Grubun sahip olduğu araziyi devredemezsiniz.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Şu anda geçiş hakkı satın alınamıyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Nesne oluşturulamıyor çünkü \nparsel dolu.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Etkinlik için yer imi oluşturulamıyor.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Tanrısal güçleriniz dondurmayı devre dışı bıraktı!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi.
+	</notification>
+	<notification name="ExpireExplanation">
+		Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı.
+	</notification>
+	<notification name="DieExplanation">
+		Sistem talebinizi işleyemiyor.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		İlkel öğeyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="RezObjectFailure">
+		Nesneyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Ana konum sıfırlandı çünkü Ana konum yasal değildi.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="SetHomePosition">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Envanter hatasından ötürü nesne oluşturulması geri alınamıyor.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Talep edilen envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Talep edilen envanter klasörü oluşturulamadı.
+	</notification>
+	<notification name="CantCreateInventory">
+		Bu envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Yer imi oluşturulamıyor.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Envanter satılık değil.
+	</notification>
+	<notification name="CantFindInvItem">
+		Envanter öğesi bulunamıyor.
+	</notification>
+	<notification name="CantFindObject">
+		Nesne bulunamıyor.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Kime ödeme yapılacağı belirlenemedi.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Kamusal nesnelere L$ veremezsiniz.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Dünya içerisindeki nesnede envater oluşturma başarısız oldu.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik.  Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Başka oyuncularla kesişen büyük primler oluşturulamaz.  Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir.
+		<usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir.
+		<usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dosyalar taşınamıyor. Önceki yol geri yüklendi.
+		<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
index 7542778aca..f330bd85e8 100644
--- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/>
 	<icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/>
 	<icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
index 0464b7ec07..87b67e249e 100644
--- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Listeyi Engelle
-	</text>
-	<scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
-	<button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/>
-	<button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/>
-	<button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrele" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/>
+		<menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/>
+		<menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/>
+		<button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..c7227f02b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(yükleniyor)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..79895f9c21
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/>
+	<icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/>
+	<button name="delete_btn" tool_tip="Bu girişi kaldır"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
index 2bc597f2fa..f44d2b5e76 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Bilinmiyor"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 1a1e53bac2..08efd0aa61 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -14,81 +14,53 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_filtered_friends_msg">
 		Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin.
 	</string>
-	<string name="people_filter_label" value="Kişileri Filtrele"/>
-	<string name="groups_filter_label" value="Grupları Filtrele"/>
 	<string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/>
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
-	<filter_editor label="Filtrele" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
-		<panel label="ARKADAŞLARIM" name="friends_panel">
+		<panel label="ARKADAŞLAR" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="GRUPLARIM" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
-				<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
+		<panel label="GRUPLAR" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Grupları Filtrele" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/>
+				<menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
+				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
 			</panel>
 		</panel>
 		<panel label="SON" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
+		<panel label="ENGELLENMİŞ" name="blocked_panel">
+			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index 231e8fc5fe..aaeebdfe6e 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<text name="font_size">
-		Font büyüklüğü:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Küçük" name="radio" value="0"/>
-		<radio_item label="Orta" name="radio2" value="1"/>
-		<radio_item label="Büyük" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
-	<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
-	<check_box label="Düz metin Aİ&apos;ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/>
-	<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Aİ&apos;leri şurada göster:
-	</text>
-	<text name="requires_restart_label">
-		(tekrar başlatma gerekir)
-	</text>
-	<radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
-		<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
-		<radio_item label="Sekmeler" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Gelen sohbet için açılır pencereleri etkinleştir:
-	</text>
-	<check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/>
-	<check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/>
-	<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
-	<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
+		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
+		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Font büyüklüğü:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Küçük" name="Small" value="0"/>
+			<item label="Orta" name="Medium" value="1"/>
+			<item label="Büyük" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			Bildirimler
+		</text>
+		<text name="friend_ims">
+			Arkadaş Aİ&apos;leri:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			Arkadaş harici Aİ&apos;ler:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="conference_ims">
+			Konferans Aİ&apos;leri:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="group_chat">
+			Grup sohbeti:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="nearby_chat">
+			Yakındaki sohbet:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+			<item label="Hiçbiri" name="None" value="none"/>
+		</combo_box>
+		<text name="notifications_alert">
+			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			Sesi çal:
+		</text>
+		<check_box label="Yeni sohbet" name="new_conversation"/>
+		<check_box label="Gelen sesli arama" name="incoming_voice_call"/>
+		<check_box label="Işınlama teklifi" name="teleport_offer"/>
+		<check_box label="Envanter teklifi" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="Günlüğü temizle..." name="clear_log"/>
+		<button label="Dökümleri sil..." name="delete_transcripts"/>
+		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
+	</panel>
 	<button label="Çeviri..." name="ok_btn"/>
 	<button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/>
 	<button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index 4a48b1588c..1a13cf8f71 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="asla" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Meşgul durumu cevabı:
+		Rahatsız Etme yanıtı:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index b0b9ab7716..9a4cf54fa7 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="Nesneyi satın al" name="Buyobject"/>
 			<combo_box.item label="Nesneye ödeme yap" name="Payobject"/>
 			<combo_box.item label="Aç" name="Open"/>
+			<combo_box.item label="Yakınlaştır" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 1be8f5974c..155dc8749a 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=tr-TR&amp;sourceid=[sourceid]
+		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
@@ -619,8 +619,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AvatarAway">
 		Uzakta
 	</string>
-	<string name="AvatarBusy">
-		Meşgul
+	<string name="AvatarDoNotDisturb">
+		Rahatsız Etme
 	</string>
 	<string name="AvatarMuted">
 		Engellenmiş
@@ -856,6 +856,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ST_NO_JOINT">
 		KÖK veya EKLEM bulunamıyor.
 	</string>
+	<string name="NearbyChatTitle">
+		Yakındaki sohbet
+	</string>
+	<string name="NearbyChatLabel">
+		(Yakındaki sohbet)
+	</string>
 	<string name="whisper">
 		fısıldar:
 	</string>
@@ -919,12 +925,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ControlYourCamera">
 		Kameranızı kontrol etmek
 	</string>
-	<string name="TeleportYourAgent">
-		Sizi ışınlama
-	</string>
 	<string name="NotConnected">
 		Bağlı Değil
 	</string>
+	<string name="AgentNameSubst">
+		(Siz)
+	</string>
+	<string name="TeleportYourAgent">
+		Sizi ışınlama
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -1006,18 +1015,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="dictionary_files">
 		Sözlükler
 	</string>
-	<string name="AvatarSetNotAway">
-		Uzakta Değil
-	</string>
-	<string name="AvatarSetAway">
-		Uzakta
-	</string>
-	<string name="AvatarSetNotBusy">
-		Meşgul Değil
-	</string>
-	<string name="AvatarSetBusy">
-		Meşgul
-	</string>
 	<string name="shape">
 		Şekil
 	</string>
@@ -1986,8 +1983,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="PanelContentsNewScript">
 		Yeni Komut Dosyası
 	</string>
-	<string name="BusyModeResponseDefault">
-		İleti gönderdiğiniz Sakin &apos;meşgul modu&apos;nda, bu da rahatsız edilmek istemediği anlamına geliyor.  İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir.
+	<string name="DoNotDisturbModeResponseDefault">
+		Bu sakin &quot;Rahatsız Etme&quot; seçeneğini devreye almış, mesajınızı sonra görecek.
 	</string>
 	<string name="MuteByName">
 		(Adına göre)
@@ -2100,9 +2097,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		İçerik
-	</string>
 	<string name="AcquiredItems">
 		Alınan Öğeler
 	</string>
@@ -3874,7 +3868,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Genel Bölge
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor
+		Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir.
@@ -3951,6 +3945,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="IM_unblock_only_groups_friends">
 		Bu mesajı görmek için Tercihler/Gizlilik&apos;de &apos;Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin&apos; seçeneğinin işaretini kaldırmalısınız.
 	</string>
+	<string name="OnlineStatus">
+		Çevrimiçi
+	</string>
+	<string name="OfflineStatus">
+		Çevrimdışı
+	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
@@ -3960,6 +3960,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="you_joined_call">
 		Sesli aramaya katıldınız
 	</string>
+	<string name="you_auto_rejected_call-im">
+		&quot;Rahatsız Etme&quot; seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz.
+	</string>
 	<string name="name_started_call">
 		[NAME] bir sesli arama başlattı
 	</string>
@@ -3976,7 +3979,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Bağlanıyor...
 	</string>
 	<string name="conference-title">
-		Özel Konferans
+		Çok kişili sohbet
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] ile konferans
@@ -4866,6 +4869,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Label">
 		Sohbet
 	</string>
+	<string name="Command_Conversations_Label">
+		Sohbetler
+	</string>
 	<string name="Command_Compass_Label">
 		Pusula
 	</string>
@@ -4941,6 +4947,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Tooltip">
 		Metin kullanarak yakındaki kişilerle sohbet etmek
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Herkesle sohbet et
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Pusula
 	</string>
@@ -5070,4 +5079,13 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
new file mode 100644
index 0000000000..37115a0310
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="交談記錄">
+	<panel name="buttons_panel">
+		<filter_editor label="人員過濾器" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
+		<menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ece263f440
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="交談：">
+	<floater.string name="Title">
+		交談：[NAME]
+	</floater.string>
+	<text name="page_label" value="頁"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 2d66c659fe..84ad869100 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談"/>
+<multi_floater name="floater_im_box" title="交談">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
+					<button name="add_btn" tool_tip="開始新的交談"/>
+					<button name="speak_btn" tool_tip="用麥克風和大家交談"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
+					<text name="stub_textbox">
+						這個交談另開了新視窗。   [secondlife:/// 把它收回來]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index 808a0b6720..d63c5507db 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,8 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="至" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
+	<floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
+	<floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
+	<floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<button name="add_btn" tool_tip="新增某人到這個交談"/>
+				<button name="voice_call_btn" tool_tip="建立語音通聯"/>
+				<button name="close_btn" tool_tip="結束這個交談"/>
+				<button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<panel name="trnsAndChat_panel">
+							<layout_stack name="translate_and_chat_stack">
+								<layout_panel name="translate_chat_checkbox_lp">
+									<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+								</layout_panel>
+							</layout_stack>
+						</panel>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="至" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 45a003d3c8..4526eff21d 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
+		如果接聽，你將切斷目前的語音交談。
 	</text>
-	<button label="接受" label_selected="接受" name="Accept"/>
-	<button label="拒絕" label_selected="拒絕" name="Reject"/>
-	<button label="開始 IM" name="Start IM"/>
+	<button label="接聽" label_selected="接聽" name="Accept"/>
+	<button label="忽視" label_selected="忽視" name="Reject"/>
+	<button label="不接聽但開啟 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index be009b54d8..d0978b8b01 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				顯示：
 			</text>
-			<check_box label="世界" name="show_world"/>
+			<check_box label="測試" name="show_world"/>
 			<check_box label="僅限可移動的" name="show_world_movables_only"/>
 			<check_box label="導航網面" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index e909a67e2c..02d06323d4 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="預設" label_selected="預設" name="Default"/>
 	<button label="空白" label_selected="空白" name="Blank"/>
 	<button label="無" label_selected="無" name="None"/>
-	<check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="已停用預覽"/>
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..96caa7d333
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="語音聊天音量">
+	<slider label="語音聊天" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index 81e0204262..aab5fa6028 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲">
+<floater label="地點" name="voice_effects" title="語音變聲試聽">
 	<string name="no_voice_effect">
 		（無變聲效果）
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
new file mode 100644
index 0000000000..4260a8d331
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="音量">
+	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index cd069f9601..eb7093a23c 100644
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
-	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
+	<menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
new file mode 100644
index 0000000000..507255d0c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="關閉交談" name="close_conversation"/>
+	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
+	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="新增朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="禁止語音" name="block_unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+	<menu_item_call label="群組檔案" name="group_profile"/>
+	<menu_item_call label="啟用群組" name="activate_group"/>
+	<menu_item_call label="離開群組" name="leave_group"/>
+	<context_menu label="主持人選項" name="Moderator Options">
+		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
+		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
+		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..49e91417e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM…" name="IM"/>
+	<menu_item_call label="語音通話…" name="Call"/>
+	<menu_item_call label="開啟聊天歷史…" name="Chat history"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="Invite"/>
+	<menu_item_call label="地圖" name="Map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..3fa99a5cd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依日期排序" name="sort_by_date"/>
+	<menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
+	<menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
new file mode 100644
index 0000000000..815b0b594c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="加為朋友" name="Add Friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="禁止語音" name="Block/Unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..a7006e524a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="精簡視野" name="compact_view"/>
+	<menu_item_check label="全展視野" name="expanded_view"/>
+	<menu_item_check label="顯示時間" name="IMShowTime"/>
+	<menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index f4f93b0bdc..9655732f2e 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="物件檔案..." name="Object Profile"/>
 	<menu_item_call label="封鎖…" name="Block"/>
+	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
+	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index e85b4b7182..258d0d6b20 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="新頭髮" name="New Hair"/>
 		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="展開全部資料夾" name="expand"/>
+	<menu_item_call label="摺疊全部資料夾" name="collapse"/>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
new file mode 100644
index 0000000000..8b35860eb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
+	<menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
+	<menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
+	<menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
+	<menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
+	<menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
+	<menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
+	<menu_item_check label="交談記錄……" name="Conversation"/>
+	<menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
+	<menu_item_check label="翻譯設定……" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..9a2a3c403d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="解除封鎖" name="unblock"/>
+	<menu_item_call label="檔案..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a8cecb4e14
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
+	<menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..5b70cd35bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依類型排序" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
new file mode 100644
index 0000000000..4251238fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依狀態排序" name="sort_status"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看許可權限" name="view_permissions"/>
+	<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index 5768c554c9..b4b566f5ca 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="語音通話" name="Call"/>
 	<menu_item_call label="啟動" name="Activate"/>
 	<menu_item_call label="退出" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
new file mode 100644
index 0000000000..05a30d938f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 38d5f3d324..d25adaf8fb 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="地圖" name="Map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="檢視聊天歷史……" name="chat_history"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 1380e0b307..69f0eab7dc 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="加為朋友" name="Add Friends"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friends"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="通話" name="call"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..9bc5638472
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依距離排序" name="sort_distance"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看地圖" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
new file mode 100644
index 0000000000..382234c3ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近排序" name="sort_most"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 592bb6561e..72629822d4 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示居民檔案" name="show_agent"/>
+	<menu_item_call label="察看檔案" name="show_agent"/>
+	<menu_item_call label="送出 IM..." name="send_im"/>
+	<menu_item_call label="加為朋友..." name="add_friend"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index b344b21c62..9f3a9d58ff 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示物件資訊" name="show_object"/>
+	<menu_item_call label="物件檔案..." name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 9a95e8c4d6..fdae3f3bd4 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,10 +16,7 @@
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
 			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="狀態" name="Status">
-			<menu_item_call label="離開" name="Set Away"/>
-			<menu_item_call label="忙碌" name="Set Busy"/>
-		</menu>
+		<menu label="狀態" name="Status"/>
 		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
 		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
 		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -30,14 +27,18 @@
 		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_check label="聊天…" name="Nearby Chat"/>
+		<menu_item_check label="交談……" name="Conversations"/>
+		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
 		<menu_item_check label="說話" name="Speak"/>
-		<menu_item_check label="語音設定…" name="Nearby Voice"/>
-		<menu_item_check label="語音變聲…" name="ShowVoice"/>
+		<menu label="語音變聲" name="VoiceMorphing">
+			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
+			<menu_item_check label="預覽……" name="Preview"/>
+			<menu_item_call label="訂閱……" name="Subscribe"/>
+		</menu>
 		<menu_item_check label="姿勢…" name="Gestures"/>
-		<menu_item_call label="朋友" name="My Friends"/>
-		<menu_item_call label="群組" name="My Groups"/>
-		<menu_item_call label="附近的人群" name="Active Speakers"/>
+		<menu_item_check label="朋友" name="My Friends"/>
+		<menu_item_check label="群組" name="My Groups"/>
+		<menu_item_check label="附近的人群" name="Active Speakers"/>
 		<menu_item_call label="封鎖清單" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 9fecf2c104..59be26d43b 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -516,6 +516,24 @@
 		</url>
 		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="AMDOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=tw
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
 	<notification name="UnknownGPU">
 		你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
 原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。  這大概不會出問題，但你可能需要調整顯像設定。
@@ -1536,10 +1554,13 @@ SHA1 指紋：[MD5_DIGEST]
 		此時無法發出交友邀請。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="BusyModeSet">
-		已設為忙碌模式。
-聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。
-		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
+	<notification name="DoNotDisturbModeSet">
+		「請勿打擾」模式目前是開啟狀態。  你將不會收到任何發給你的訊息通知。
+
+- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 &gt; 一般設定」）。
+- 所有瞬間傳送的邀請都將被婉拒。
+- 所有語音來電都將拒絕接聽。
+		<usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。
@@ -2024,6 +2045,10 @@ SHA1 指紋：[MD5_DIGEST]
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
 		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		新增一個人到現有的交談，等於建立新的交談。  所有交談者將會收到新交談通知。
+		<usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
 		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
@@ -2098,14 +2123,14 @@ SHA1 指紋：[MD5_DIGEST]
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="忙碌模式警告" name="BusyModePay">
-		你現在處於忙碌模式，這意味著你付費後仍將不會收到任何物項。
+	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
+		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
 
-你是否要先離開忙碌模式，再完成交易？
+是否要在完成交易之前，先關閉「請勿打擾」模式？
 		<form name="form">
-			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
-			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
-			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
+			<ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/>
+			<button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
+			<button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2240,11 +2265,8 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="GroupNotice">
 		主旨：[SUBJECT]，訊息：[MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前在線上
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前離線
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		雖然你人很好，你還是不能把自己加為朋友。
@@ -2472,13 +2494,6 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="DynamicPathfindingDisabled">
 		這地區並未啟用動態尋徑。  使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。
 	</notification>
-	<notification name="PathfindingRebakeNavmesh">
-		更改本地區的某些物件將導致其他移動物件的運作發生問題。  要使移動物件正常運作，請點按「重新產出地區」按鈕。  欲獲知詳情請選擇「幫助」。
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
-		</url>
-		<usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/>
-	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		發生錯誤。  問題可能出在網路或伺服器，也可能因為你無權建製物件。  有時，只要登出再登入即能解決這類問題。
 		<usetemplate name="okbutton" yestext="確定"/>
@@ -2741,7 +2756,7 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ScriptQuestionCaution">
 		警告：物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。
   
-這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
+如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
 		<form name="form">
 			<button name="Grant" text="允許全權存取"/>
 			<button name="Deny" text="拒絕"/>
@@ -3323,4 +3338,633 @@ SHA1 指紋：[MD5_DIGEST]
 		你正在刪除 [NUM_ITEMS] 個物項。  你確定你要繼續？
 		<usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		化身已凍結。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] 解除了對你的凍結。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		化身已解除凍結。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		凍結失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		你遭凍結的時間已過，請恢復正常活動。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		抱歉，無法凍結該用戶。
+	</notification>
+	<notification name="NowOwnObject">
+		你現在是物件 [OBJECT_NAME] 的所有人
+	</notification>
+	<notification name="CantRezOnLand">
+		無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。  請用土地工具察看所有人。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		無法產生物件，此刻要求數目過多。
+	</notification>
+	<notification name="SitFailCantMove">
+		你無法坐下，因為此刻你不能移動。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		你不能坐下，因為該土地不允許。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		請挨近一點。  無法坐在物件上，因為
+它和你不在同一個地區。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		無法建立新物件。 地區已滿載。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		你無法在別人的土地上建立樹和草。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		複製失敗，你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		選取了沒有根的重覆物件。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		無法複製物件，因為地區滿載。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		無法複製物件，找不到它們所在的地段。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		無法建立物件，因為 
+地段滿載。
+	</notification>
+	<notification name="RezAttemptFailed">
+		試圖產生物件失敗。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		無法建立已在此地區造成問題的物件。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		該收納區物項已被列入黑名單。
+	</notification>
+	<notification name="NoCanRezObjects">
+		你此時無權建立物件。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地搜尋遭禁。
+你在短時間內進行了太多次土地搜尋。
+請稍候再試。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		你已經死亡並且被瞬間傳送回你的家的位置
+	</notification>
+	<notification name="EjectComingSoon">
+		你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。
+	</notification>
+	<notification name="NoEnterServerFull">
+		你無法進入這地區，因為 
+伺服器滿載。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「儲存回收納區」功能已被停用。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容，因為產生它的來源物件已不存在。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		無法儲存 [OBJ_NAME] 到物件內容，你無權修改 &apos;[DEST_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區，此動作已被停用。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		無法複製你所選的，因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoTransNoCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		無法儲存你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		無法儲存你所選的，因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
+	</notification>
+	<notification name="NoModNoTaking">
+		無法拿取你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="RezDestInternalError">
+		內部錯誤：未知的目的地類型。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		刪除失敗，因為找不到物件
+	</notification>
+	<notification name="SorryCantEjectUser">
+		抱歉，無法踢出該用戶。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="HomeLocationLimits">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="HomePositionSet">
+		我的家位置已定。
+	</notification>
+	<notification name="AvatarEjected">
+		化身已被踢出。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		踢出失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]）
+	</notification>
+	<notification name="NoPermModifyObject">
+		你無權變更該物件
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		對導航網面有貢獻的物件，無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		鍵格動畫物件無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		無法啟用物件的物理——土地資源不足。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。
+	</notification>
+	<notification name="UnableAddItem">
+		無法新增項目！
+	</notification>
+	<notification name="UnableEditItem">
+		無法編輯這項目！
+	</notification>
+	<notification name="NoPermToEdit">
+		無權編輯這項目。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		無權複製該收納區。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		無法儲存到物件內容：該項目已不存在。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		無法儲存到物件內容：收納區已存在同名稱的項目
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		無法儲存到物件內容：這麼做將修改附件的權限。
+	</notification>
+	<notification name="TooManyScripts">
+		腳本太多。
+	</notification>
+	<notification name="UnableAddScript">
+		無法新增腳本！
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資產伺服器未在正常時間內反應。  物件已返交模擬器。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		本地區未啟用物理形狀。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		你無法變更跨越地區界限的導航網面。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		該物件類型不得設定物理性質。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		根幾何元件無法設成無形狀。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		本地區未啟用物理材料。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		只能調整根幾何元件的物理材料。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		尚不支援角色設定物理材料。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定的物理材料屬性中，至少有一個無效。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		網面物件的縫合類型不得變更。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		網面物件的形狀不得變更。
+	</notification>
+	<notification name="FullRegionCantEnter">
+		你無法進入這地區，\n因為地區滿載。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		聯結失敗——所有人不同
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		聯結失敗——無法修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		聯結失敗，你無權編輯。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		聯結失敗——幾何元件太多
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		聯結失敗——沒有可聯結的東西。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		聯結失敗——尋徑角色太多
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		聯結失敗——土地資源不足
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		物件使用了過多物理資源，其動態特性已被停用。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
+	</notification>
+	<notification name="TeleportedByAttachment">
+		你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		無法建立要求的物件。 地區已滿載。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		你不能將多個物件附著到同一個點。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		你不能在此建立多個物件。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		無法建立要求的物件。 物件在資料庫中找不到。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		無法建立要求的物件。 要求逾時，無法完成。 請再試一次。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		無法建立要求的物件。 請再試一次。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		物件產生失敗，要求的物件載入時間太久。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		你不得在這土地上建立植物。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		無法恢復物件。 找不到虛擬世界的位置。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		無法產生物件，它的網面資料無效。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		無法產生物件，因為這地區已有太多的腳本。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		你無權在此建立物件。
+	</notification>
+	<notification name="CantCreateObject">
+		你此時無權建立物件。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無效的物件參數
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		你權限不夠，無法在此複製物件。
+	</notification>
+	<notification name="CantChangeShape">
+		你無權變更這個形狀。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		你權限不夠，無法在此收取物件。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		讓渡失敗，你無權為你的群組讓渡物件。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		你權限不夠，無法在此購買物件。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		無法附著物件，有個化身正坐在物件上。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		樹和草不能當附件穿戴。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		無法附著群組所擁有的物件。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		無法附著不是你擁有的物件。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		無法附著對導航網面有貢獻的物件。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		無法附著物件，你無權移動該物件。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		你無法在此卸除物件，請到「自由嘗試」區域再試。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		卸除附件失敗：你無權在此處卸除。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		卸除附件失敗：可用土地資源不足。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		卸除附件失敗：可用資源不足。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		無法在此卸除物件。  地段滿載。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		無法觸摸/抓取此物件，因為你在該土地地段遭禁。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		請將刪除參數範圍調小一點。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		無法上傳資產。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		找不到要瞬間傳送到家的用戶
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		要求神的權力失敗
+	</notification>
+	<notification name="GenericRequestFailed">
+		普通請求失敗
+	</notification>
+	<notification name="CantUploadPostcard">
+		無法上傳明信片。  請稍候再試一次。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		無法取得群組通知的收納區細節。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		無法送出群組通知——未准許。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		無法送出群組通知——收納區建立失敗。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		無法剖析通知裡的收納品項。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形上傳失敗。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形檔案已寫入。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形檔案已寫入，開始下載……
+	</notification>
+	<notification name="TerrainBaked">
+		地形已定貌。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		你必須先更新瀏覽器後，才可購買這個地段。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		無法購買，此地段不供出售。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		無法購買，售價或土地面積已變。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		你不是此地段的獲授權的買主。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		你無法購買此地段，該地段已在等候批准購買
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		你不得在此建立物件，這麼做將導致地段超載。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		未選取足夠租用地段，無法合併。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地分割成功。
+	</notification>
+	<notification name="PassPurchased">
+		你購買了通行權。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		地區不允許分類廣告。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		你在此土地的通行權即將到期失效。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		沒有合適的表面讓你坐下，請試一試別處。
+	</notification>
+	<notification name="CantSitNoRoom">
+		這裡沒有空間讓你坐下，請試試另一處。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		收取物件失敗，因為你權限不足。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		收取物件失敗，因為你 L$ 金額不足。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		無法讓渡群組所擁有的土地。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		購買物件失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		購買收納區失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		你的 L$ 不足，無法購買此土地的通行權。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		此時無法購買通行權。  請稍候再試一次。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		無法建立物件，\n地段滿載。
+	</notification>
+	<notification name="FailedPlacingObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		無法為活動建立地標。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		你擁有的神力解除了凍結！
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		要求特殊能力失敗。 該要求已載入記錄。
+	</notification>
+	<notification name="ExpireExplanation">
+		系統此時無法處理你的要求。 要求逾時，無法完成。
+	</notification>
+	<notification name="DieExplanation">
+		系統無法處理你的要求。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		金額不足，無法建立幾何元件。
+	</notification>
+	<notification name="RezObjectFailure">
+		金額不足，無法建立物件。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		已重設「我的家」位置，因為前一個位置不合法。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="SetHomePosition">
+		我的家位置已定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		收納區出錯，無法收納物件。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		無法建立要求的收納區。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		無法建立要求的收納區資料夾。
+	</notification>
+	<notification name="CantCreateInventory">
+		無法建立該收納區。
+	</notification>
+	<notification name="CantCreateLandmark">
+		無法建立地標。
+	</notification>
+	<notification name="CantCreateOutfit">
+		此時無法建立裝扮。 請過一分鐘後再試。
+	</notification>
+	<notification name="InventoryNotForSale">
+		收納區沒有待售。
+	</notification>
+	<notification name="CantFindInvItem">
+		找不到收納區物項。
+	</notification>
+	<notification name="CantFindObject">
+		找不到物件。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		此地區目前未啟用轉移金錢給物件的功能。
+	</notification>
+	<notification name="CantPayNoAgent">
+		無法決定付款給誰。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		你無法將 L$ 送給公共物件。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		針對虛擬世界物件建立收納區失敗。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		發生內部錯誤，我們無法如常更新你的瀏覽器。  你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		無法建立和其他參與者發生交截的大型幾何元件。  請等其他參與者移開後再試。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		這動作將刪除先前交談的記錄，和所有記錄備份。
+		<usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
+		<usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		無法移動檔案。 已恢復前一個路徑。
+		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index 1c8b56b3d6..e0a49a0add 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
 	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
 	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 1dfa024138..9f59bb32f8 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		封鎖清單
-	</text>
-	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
-	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
-	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
-	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="過濾器" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
+		<menu_button name="view_btn" tool_tip="排序選項"/>
+		<menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/>
+		<button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..6524d41645
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（載入中）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..8446ce2130
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="包含語音交談"/>
+	<icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
+	<button name="delete_btn" tool_tip="移除此項目"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index 175293cdf7..fec4bb572a 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 59ea7b70e2..5f7aca387a 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,81 +14,53 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
-	<string name="people_filter_label" value="人員過濾器"/>
-	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
-	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
-		<panel label="我的朋友" name="friends_panel">
+		<panel label="朋友" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人員過濾器" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="我的群組" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+		<panel label="群組" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="群組過濾器" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人員過濾器" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
+		<panel label="已封鎖的" name="blocked_panel">
+			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index cf2f81d313..e700e35516 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,34 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<text name="font_size">
-		字型尺寸：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
-	<check_box label="聊天泡泡" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		顯示 IMs 於：
-	</text>
-	<text name="requires_restart_label">
-		（須重新啟動）
-	</text>
-	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
-		<radio_item label="分開視窗" name="radio" value="0"/>
-		<radio_item label="頁籤" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		啟用傳入聊天的突顯示視窗：
-	</text>
-	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
-	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
-	<spinner label="附近聊天內容提示框停駐時間：" name="nearby_toasts_lifetime"/>
-	<spinner label="附近聊天內容提示框消退時間：" name="nearby_toasts_fadingtime"/>
+	<panel>
+		<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+		<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			字型尺寸：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="聊天泡泡" name="bubble_text_chat"/>
+	</panel>
+	<panel>
+		<text name="notifications">
+			通知
+		</text>
+		<text name="friend_ims">
+			朋友 IM：
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="non_friend_ims">
+			非朋友 IM：
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="conference_ims">
+			多方交談 IM：
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="group_chat">
+			群組聊天：
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="nearby_chat">
+			附近的聊天：
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+			<item label="無" name="None" value="無"/>
+		</combo_box>
+		<text name="notifications_alert">
+			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
+		</text>
+	</panel>
+	<panel>
+		<text name="play_sound">
+			播放聲音：
+		</text>
+		<check_box label="新交談" name="new_conversation"/>
+		<check_box label="語音通話來電" name="incoming_voice_call"/>
+		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
+		<check_box label="收納物品贈送" name="inventory_offer"/>
+	</panel>
+	<panel>
+		<button label="清空記錄……" name="clear_log"/>
+		<button label="刪除交談內容記錄……" name="delete_transcripts"/>
+		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
+	</panel>
 	<button label="翻譯…" name="ok_btn"/>
 	<button label="自動取代…" name="autoreplace_showgui"/>
 	<button label="拼字檢查…" name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 7e67a0d02d..044edbed70 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		忙碌模式回應：
+		「請勿打擾」預設回應：
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 982dde4010..60f44a3d88 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -72,6 +72,7 @@
 			<combo_box.item label="購買物件" name="Buyobject"/>
 			<combo_box.item label="支付物件" name="Payobject"/>
 			<combo_box.item label="打開" name="Open"/>
+			<combo_box.item label="縮放" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 7e17ed6864..31713ac281 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="AvatarAway">
 		離開
 	</string>
-	<string name="AvatarBusy">
-		忙碌
+	<string name="AvatarDoNotDisturb">
+		請勿打擾
 	</string>
 	<string name="AvatarMuted">
 		封鎖的
@@ -851,6 +851,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ST_NO_JOINT">
 		找不到 ROOT 或旋軸。
 	</string>
+	<string name="NearbyChatTitle">
+		附近的聊天中
+	</string>
+	<string name="NearbyChatLabel">
+		（附近的聊天）
+	</string>
 	<string name="whisper">
 		低語：
 	</string>
@@ -914,12 +920,15 @@ http://secondlife.com/viewer-access-faq
 	<string name="ControlYourCamera">
 		控制你的攝影機
 	</string>
-	<string name="TeleportYourAgent">
-		瞬間傳送你本人
-	</string>
 	<string name="NotConnected">
 		未聯接
 	</string>
+	<string name="AgentNameSubst">
+		（你）
+	</string>
+	<string name="TeleportYourAgent">
+		瞬間傳送你本人
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -1001,18 +1010,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="dictionary_files">
 		字典
 	</string>
-	<string name="AvatarSetNotAway">
-		非離開
-	</string>
-	<string name="AvatarSetAway">
-		離開
-	</string>
-	<string name="AvatarSetNotBusy">
-		非忙碌
-	</string>
-	<string name="AvatarSetBusy">
-		忙碌
-	</string>
 	<string name="shape">
 		體形
 	</string>
@@ -1981,8 +1978,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="PanelContentsNewScript">
 		新腳本
 	</string>
-	<string name="BusyModeResponseDefault">
-		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
+	<string name="DoNotDisturbModeResponseDefault">
+		這居民處於「請勿打擾」狀態，不會立即看到你的訊息。
 	</string>
 	<string name="MuteByName">
 		（按名稱）
@@ -2095,9 +2092,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		內容
-	</string>
 	<string name="AcquiredItems">
 		取得物品
 	</string>
@@ -3869,7 +3863,7 @@ http://secondlife.com/viewer-access-faq
 		一般普級地區
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		可看到本地段外的化身，並與之交談
+		這地段外的其他化身，看不見也聽不到位於地段裡的化身
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地區重新產出之前，可移動物件可能無法正常運作。
@@ -3946,6 +3940,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="IM_unblock_only_groups_friends">
 		要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
 	</string>
+	<string name="OnlineStatus">
+		上線
+	</string>
+	<string name="OfflineStatus">
+		離線
+	</string>
 	<string name="answered_call">
 		你的通話已經接通
 	</string>
@@ -3955,6 +3955,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="you_joined_call">
 		你發起了語音通話
 	</string>
+	<string name="you_auto_rejected_call-im">
+		因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。
+	</string>
 	<string name="name_started_call">
 		[NAME] 發起了語音通話
 	</string>
@@ -3971,7 +3974,7 @@ http://secondlife.com/viewer-access-faq
 		聯接中...
 	</string>
 	<string name="conference-title">
-		臨時多方通話
+		多人聊天
 	</string>
 	<string name="conference-title-incoming">
 		和 [AGENT_NAME] 多方通話
@@ -4863,6 +4866,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Label">
 		聊天
 	</string>
+	<string name="Command_Conversations_Label">
+		交談
+	</string>
 	<string name="Command_Compass_Label">
 		羅盤
 	</string>
@@ -4938,6 +4944,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Tooltip">
 		透過文字和附近人們聊天
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		和所有人交談
+	</string>
 	<string name="Command_Compass_Tooltip">
 		指南針
 	</string>
@@ -5067,4 +5076,13 @@ http://secondlife.com/viewer-access-faq
 	<string name="UserDictionary">
 		[User]
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
+	</string>
 </strings>
-- 
cgit v1.2.3


From 474905badef4679bbce53306c49343703be38263 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Tue, 30 Apr 2013 16:04:41 -0700
Subject: MAINT-2646 Viewer should neither grant nor display prompts for
 unimplemented LSL permissions * Add the newer run time permissions to the
 viewer * Filter requested permissions by those the viewer knows about * Show
 a dialog indicating unknown permissions were requested and a new viewer  
 will be needed to grant them. reviewed with Simon and Soft

---
 .../newview/skins/default/xui/en/notifications.xml | 23 +++++++++++++++++++++-
 indra/newview/skins/default/xui/en/strings.xml     |  7 ++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 105bef7321..1f39ec041e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6863,8 +6863,29 @@ Do not allow access if you do not fully understand why it wants access to your a
 [FOOTERTEXT]
     </footer>
   </notification>
+	
+	<notification
+	 icon="notify.tga"
+	 name="UnknownScriptQuestion"
+	 persist="false"
+	 type="notify">
+		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requested an unknown script runtime permission. 
+
+Please update your viewer to grant this permission.
+		<tag>confirm</tag>
+		<form name="form">
+			<button
+			 index="0"
+			 name="Ok"
+			 text="Ok"/>
+			<button
+			 index="2"
+			 name="Mute"
+			 text="Block"/>
+		</form>
+	</notification>
 
-  <notification
+	<notification
    icon="notify.tga"
    name="ScriptDialog"
    show_toast="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7c08aef65e..e52e941c28 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -410,7 +410,12 @@ Please try logging in again in a minute.</string>
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
   <string name="TeleportYourAgent">Teleport you</string>
-
+	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
+	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
+	<string name="OverrideYourAnimations">Replace your default animations</string>
+	<string name="ScriptReturnObjects">Return objects on your behalf</string>
+	<string name="UnknownScriptPermission">(unknown)!</string>
+	
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">General</string>
 	<string name="SIM_ACCESS_MATURE">Moderate</string>
-- 
cgit v1.2.3


From 93fc63c999a649f31b239b3def5f45d82cb37224 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 1 May 2013 13:10:44 -0700
Subject: NORSPEC-51 Fix for Incorrect Texture icon used in build tool when
 normal or specular map is not set to 'Use Texture'

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 678b4f43cd..88b163252a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -139,7 +139,7 @@
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
-             fallback_image="locked_image.j2c"
+             fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
              label="Texture       "
@@ -216,7 +216,7 @@
              allow_no_texture="true"
              can_apply_immediately="true"
              default_image_name="Default"
-             fallback_image="locked_image.j2c"
+             fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
              label="Texture       "
@@ -327,7 +327,7 @@
              allow_no_texture="true"
              can_apply_immediately="true"
              default_image_name="Default"
-             fallback_image="locked_image.j2c"
+             fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
              label="Texture       "
-- 
cgit v1.2.3


From 45a44225f5be261bf42d69c0c7ac01b1235c836c Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Fri, 3 May 2013 00:58:55 +0000
Subject: MAINT-2646 Viewer should neither grant nor display prompts for
 unimplemented LSL permissions * Change text of dialog * Add callback for mute
 button reviewed with Richard and Widely.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1f39ec041e..1a7ebaccbd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6869,14 +6869,15 @@ Do not allow access if you do not fully understand why it wants access to your a
 	 name="UnknownScriptQuestion"
 	 persist="false"
 	 type="notify">
-		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requested an unknown script runtime permission. 
+The runtime script permission requested by &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, isn&apos;t recognized by the viewer and can&apos;t be granted.
 
-Please update your viewer to grant this permission.
+To grant this permission please update your viewer to the latest version from [DOWNLOADURL].
 		<tag>confirm</tag>
 		<form name="form">
 			<button
-			 index="0"
-			 name="Ok"
+			 default="true"
+			 index="1"
+			 name="Deny"
 			 text="Ok"/>
 			<button
 			 index="2"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e52e941c28..3b57ff5fd6 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -61,6 +61,7 @@
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
 
+	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
 http://secondlife.com/download
-- 
cgit v1.2.3


From 9187a06d0bc70ea7670192a5fe53f75ef6f36259 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Fri, 3 May 2013 09:16:15 -0700
Subject: NORSPEC-151 make disabling bumpyshiny disable adv lighting model as
 well

---
 .../default/xui/en/panel_preferences_graphics1.xml | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

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

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 708dcf4e95..d7db7caf66 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -211,16 +211,19 @@
 		 name="TransparentWater"
 		 top_pad="7"
 		 width="256" />
-		<check_box
-		 control_name="RenderObjectBump"
-		 height="16"
-		 initial_value="true"
-		 label="Bump mapping and shiny"
-		 layout="topleft"
-		 left_delta="0"
-		 name="BumpShiny"
-		 top_pad="1"
-		width="256" />
+      <check_box
+       control_name="RenderObjectBump"
+       height="16"
+       initial_value="true"
+       label="Bump mapping and shiny"
+       layout="topleft"
+       left_delta="0"
+       name="BumpShiny"
+       top_pad="1"
+      width="256">
+        <check_box.commit_callback
+        function="Pref.VertexShaderEnable" />
+      </check_box>
     <check_box
 		control_name="RenderLocalLights"
 		height="16"
-- 
cgit v1.2.3


From 04fceb5f006d6f3b9b36996382e4c1483a599dde Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Fri, 3 May 2013 09:16:15 -0700
Subject: NORSPEC-151 make disabling bumpyshiny disable adv lighting model as
 well

---
 .../default/xui/en/panel_preferences_graphics1.xml | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

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

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 708dcf4e95..d7db7caf66 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -211,16 +211,19 @@
 		 name="TransparentWater"
 		 top_pad="7"
 		 width="256" />
-		<check_box
-		 control_name="RenderObjectBump"
-		 height="16"
-		 initial_value="true"
-		 label="Bump mapping and shiny"
-		 layout="topleft"
-		 left_delta="0"
-		 name="BumpShiny"
-		 top_pad="1"
-		width="256" />
+      <check_box
+       control_name="RenderObjectBump"
+       height="16"
+       initial_value="true"
+       label="Bump mapping and shiny"
+       layout="topleft"
+       left_delta="0"
+       name="BumpShiny"
+       top_pad="1"
+      width="256">
+        <check_box.commit_callback
+        function="Pref.VertexShaderEnable" />
+      </check_box>
     <check_box
 		control_name="RenderLocalLights"
 		height="16"
-- 
cgit v1.2.3


From 29246e8a1fa1f8ebec307cc32017910d1e4ab5f4 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 7 May 2013 12:27:03 -0700
Subject: NORSPEC-165 tweak panel_tools_texture layout to uncrop the planar
 align checkbox

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 88b163252a..a5425062ec 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -2,7 +2,7 @@
 <panel
          border="false"
          follows="all"
-         height="400"
+         height="420"
          label="Texture"
          layout="topleft"
          left="0"
@@ -743,7 +743,7 @@
              left="7"
              name="checkbox planar align"
              tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="26"
+             top_delta="16"
              width="260" />
             <web_browser
              visible="false"
-- 
cgit v1.2.3


From 9b632f060b7b9dcd33858b5c31d538760d0666ae Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 10 May 2013 16:10:17 -0700
Subject: NORSPEC-132 Fix for Rotation degree has range -9999.00..9999.00

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index a5425062ec..b6fc48212a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -644,8 +644,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="180"
-             min_val="-180"
+             max_val="9999"
+             min_val="-9999"
              name="bumpyRot"
              width="265" />
 
@@ -707,8 +707,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="180"
-             min_val="-180"
+             max_val="9999"
+             min_val="-9999"
              name="shinyRot"
              width="265" />
 
-- 
cgit v1.2.3


From f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Sat, 11 May 2013 19:58:56 -0700
Subject: Fix many issues with selection misapplication and rendering not
 matching applied materials

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index b6fc48212a..a5425062ec 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -644,8 +644,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="9999"
-             min_val="-9999"
+             max_val="180"
+             min_val="-180"
              name="bumpyRot"
              width="265" />
 
@@ -707,8 +707,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="9999"
-             min_val="-9999"
+             max_val="180"
+             min_val="-180"
              name="shinyRot"
              width="265" />
 
-- 
cgit v1.2.3


From d9e8ee7cfd323872145c23e4032989f9b7770f55 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Mon, 13 May 2013 13:02:53 -0700
Subject: NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more
 consistent and increased max range on repeats per meter

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index a5425062ec..5be3ca9d9f 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -567,7 +567,7 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="10"
+             max_val="100"
              min_val="0.1"
              name="rptctrl"
              width="265" />
-- 
cgit v1.2.3


From 3187ee18e1fa5a8b3f719f26f32b01b817791a4e Mon Sep 17 00:00:00 2001
From: PavelK ProductEngine <pkrivich@productengine.com>
Date: Wed, 15 May 2013 20:31:47 +0300
Subject: CHUI-945 FIXED Add Object IMs to Chat Notification Preferences

---
 .../default/xui/en/panel_preferences_chat.xml      | 140 +++++++++++++++++----
 1 file changed, 113 insertions(+), 27 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index bd096ebb88..2fd26e3f01 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -100,14 +100,6 @@
       left="13"
       width="517">
 
-    <text
-        layout="topleft"
-        height="12"
-        name="notifications"
-        left="0"
-        width="120">
-      Notifications
-    </text>
     <text
         layout="topleft"
         height="12"
@@ -138,17 +130,27 @@
           name="FlashToolbarButton"
           value="flash"/>
       <item
-          label="None"
-          name="None"
-          value="none"/>
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
     </combo_box>
+    <check_box
+        control_name="PlaySoundFriendIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_friend_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
         layout="topleft"
         height="12"
         name="non_friend_ims"
         width="145"
         left="0"
-        top_pad="9">
+        top_pad="11">
       Non-friend IMs:
     </text>
     <combo_box
@@ -172,17 +174,27 @@
           name="FlashToolbarButton"
           value="flash"/>
       <item
-          label="None"
-          name="None"
-          value="none"/>
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
     </combo_box>
+    <check_box
+        control_name="PlaySoundNonFriendIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_non_friend_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
         layout="topleft"
         left="0"
         height="13"
         name="conference_ims"
         width="145"
-        top_pad="9">
+        top_pad="11">
       Conference IMs:
     </text>
     <combo_box
@@ -206,17 +218,27 @@
           name="FlashToolbarButton"
           value="flash"/>
       <item
-          label="None"
-          name="None"
-          value="none"/>
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
     </combo_box>
+    <check_box
+        control_name="PlaySoundConferenceIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_conference_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
         layout="topleft"
         left="0"
         height="13"
         name="group_chat"
         width="145"
-        top_pad="9">
+        top_pad="11">
       Group chat:
     </text>
     <combo_box
@@ -240,17 +262,27 @@
           name="FlashToolbarButton"
           value="flash"/>
       <item
-          label="None"
-          name="None"
-          value="none"/>
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
     </combo_box>
+    <check_box
+        control_name="PlaySoundGroupChatIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_group_chat_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
         layout="topleft"
         left="0"
         height="12"
         name="nearby_chat"
         width="145"
-        top_pad="9">
+        top_pad="11">
       Nearby chat:
     </text>
     <combo_box
@@ -274,10 +306,64 @@
           name="FlashToolBarButton"
           value="flash"/>
       <item
-          label="None"
-          name="None"
-          value="none"/>
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
     </combo_box>
+    <check_box
+        control_name="PlaySoundNearbyChatIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_nearby_chat_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="12"
+        name="object_ims"
+        width="145"
+        top_pad="11">
+      Object IMs:
+    </text>
+    <combo_box
+        control_name="NotificationObjectIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="ObjectIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolBarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
+    <check_box
+        control_name="PlaySoundObjectIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_object_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
         layout="topleft"
         left="0"
-- 
cgit v1.2.3


From 20fc4bf1867b5165ebc140bd5f7a557874689681 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 15 May 2013 12:55:01 -0700
Subject: NORSPEC-132 Fix (again) Rotation degree has range -9999.00..9999.00

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 5be3ca9d9f..626115bd5d 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -644,8 +644,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="180"
-             min_val="-180"
+             max_val="9999"
+             min_val="-9999"
              name="bumpyRot"
              width="265" />
 
@@ -707,8 +707,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="180"
-             min_val="-180"
+             max_val="9999"
+             min_val="-9999"
              name="shinyRot"
              width="265" />
 
-- 
cgit v1.2.3


From 0cb2b30bfb239f05e1780cae5e3a7328a1474416 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 17 May 2013 11:45:06 -0700
Subject: Simple imposter AV rendering cleanup

---
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 -----
 .../newview/skins/default/xui/en/notifications.xml | 39 ----------------------
 2 files changed, 48 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f66272aa2e..9c8313f46c 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -547,15 +547,6 @@
             <menu_item_check.on_check
                control="NavBarShowParcelProperties" />
           </menu_item_check>
-          <menu_item_check
-             label="Simple Imposters"
-             name="RenderAutoMuteEnabled">
-            <menu_item_check.on_check
-               control="RenderAutoMuteEnabled" />
-            <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="RenderAutoMuteEnabled" />
-          </menu_item_check>
           <menu_item_separator />
           <menu_item_check
              label="Advanced Menu"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5bf33da14a..1e18ddbf99 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -202,45 +202,6 @@ Message Template [PATH] not found.
      yestext="OK"/>
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="ExceededHighDetailRenderCost"
-   persist="false"
-   type="alertmodal">
-    Your avatar has become too complex to be rendered by even high performance computers.  Almost all Residents will see a low detail stand in instead of your actual avatar.
-    <unique/>
-    <usetemplate
-     ignoretext="Avatar exceeded high detail complexity."
-     name="okignore"
-     yestext="Close"/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ExceededMidDetailRenderCost"
-   persist="false"
-   type="alertmodal">
-    Your avatar has become too complex to be rendered by most computers.  Many Residents will see a low detail stand in instead of your actual avatar.
-  <unique/>
-  <usetemplate
-   ignoretext="Avatar exceeded mid detail complexity."
-   name="okignore"
-   yestext="Close"/>
-</notification>
-
-  <notification
- icon="notify.tga"
- name="ExceededLowDetailRenderCost"
- persist="false"
- type="alertmodal">
-    Your avatar has become too complex to be rendered by some computers.  Some Residents will see a low detail stand in instead of your actual avatar.
-  <unique/>
-  <usetemplate
-   ignoretext="Avatar exceeded low detail complexity."
-   name="okignore"
-   yestext="Close"/>
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="WearableSave"
-- 
cgit v1.2.3


From 187c7042b98ce393b16d4277fd024d99e5cad0c5 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 21 May 2013 11:43:37 -0400
Subject: CHOP-948: correctly persist the UpdaterWillingToTest preference

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 2fb6a9fd40..dd4533ae74 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -237,8 +237,7 @@
     enabled="true"
     follows="left|top"
     height="14"
-    initial_value="true"
-    control_name="UpdateWillingToTest"
+    control_name="UpdaterWillingToTest"
     label="Willing to update to release candidates"
     left_delta="0"
     mouse_opaque="true"
-- 
cgit v1.2.3


From b3000136b852694a057c6e3c1d5b2e8e36f7c5e5 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Wed, 22 May 2013 12:22:04 -0700
Subject: NORSPEC-186 clamp norm/spec map rotations to 0-360 until we can fix
 the server side issue with negative rotations

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 626115bd5d..d3a9437063 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -644,8 +644,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="9999"
-             min_val="-9999"
+             max_val="360"
+             min_val="0"
              name="bumpyRot"
              width="265" />
 
@@ -707,8 +707,8 @@
              layout="topleft"
 			 label_width="205"
              left="10"
-             max_val="9999"
-             min_val="-9999"
+             max_val="360"
+             min_val="0"
              name="shinyRot"
              width="265" />
 
-- 
cgit v1.2.3


From 9030ecec062cd31ffa6eeffc409eeccb0ad4baa5 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Thu, 23 May 2013 10:55:41 -0700
Subject: NORSPEC-193 NORSPEC-161 add new batch break criterion to
 CompareBatchBreakerModified and add shortcut for materials info dump

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 500c11da74..b01c3067ff 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2666,7 +2666,8 @@
             </menu_item_call>
             <menu_item_call
              label="Selected Material Info"
-             name="Selected Material Info">
+             name="Selected Material Info"
+             shortcut="control|alt|shift|M">
                 <menu_item_call.on_click
                  function="Advanced.SelectedMaterialInfo" />
             </menu_item_call>
-- 
cgit v1.2.3


From f52b5dbcd36062e29b2d7fb35a23606531c446d4 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 24 May 2013 19:42:37 +0300
Subject: CHUI-955 FIXED Docked Group and Torn off p2p panel can be resized
 small enough for buttons to overlap

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 8da4213c65..2853f94b16 100755
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -222,7 +222,7 @@
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="172">
+                     min_width="236">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
-- 
cgit v1.2.3


From 706200e2348b050fe90624c3cda7045e53d72f2f Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 24 May 2013 21:44:11 +0300
Subject: CHUI-955 FIXED Docked Group and Torn off p2p panel can be resized
 small enough for buttons to overlap:  - reverting previous fix;

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 2853f94b16..8da4213c65 100755
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -222,7 +222,7 @@
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="236">
+                     min_width="172">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
-- 
cgit v1.2.3


From eff548310117faaa9b8489891f60b4f2742da4cb Mon Sep 17 00:00:00 2001
From: PavelK ProductEngine <pkrivich@productengine.com>
Date: Fri, 24 May 2013 18:19:10 +0300
Subject: CHUI-964 FIXED Oversized "To" input field hides actual IM text

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index da016462db..1215efb7f9 100755
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -4,6 +4,7 @@
  can_minimize="true"
  can_resize="true"
  height="210"
+ min_height="210"
  layout="topleft"
  name="floater_im_box"
  help_topic="floater_im_box"
-- 
cgit v1.2.3


From ca6ba9f4fd514cca28e690fb1219e20e22f6a8e4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 27 May 2013 18:09:31 +0300
Subject: CHUI-827 FIXED "Linksets" menu item is added

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a11cd13fdb..909bde7c51 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -874,6 +874,15 @@
                  function="Tools.EnableSelectNextPart" />
             </menu_item_call>
         </menu>
+        <menu_item_call
+            label="Linksets..."
+            name="pathfinding_linkset_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
+        </menu_item_call> 
         <menu_item_separator/>
 
         <menu_item_call
@@ -896,7 +905,7 @@
           <menu_item_call.on_enable
              function="Tools.SomethingSelectedNoHUD" />
         </menu_item_call>
-
+		 
         <menu_item_separator/>
 
         <menu
-- 
cgit v1.2.3


From 4d66b25abfc28352cefcc7665ecb1ee6e68f858b Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 28 May 2013 11:59:20 -0700
Subject: NORSPEC-182 do not add 'Use Texture' menu items in XML to avoid
 accidental appearance in menu 1st time

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index d3a9437063..5ac2ec2b20 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -318,10 +318,13 @@
                  label="weave"
                  name="weave"
                  value="weave" />
+              <!--
+                 NORSPEC-182, ensure item doesn't show up in menu until it should
                 <combo_box.item
                  label="Use texture"
                  name="Use texture"
                  value="Use texture" />
+                 -->
             </combo_box>
             <texture_picker
              allow_no_texture="true"
@@ -373,10 +376,13 @@
                  label="High"
                  name="High"
                  value="High" />
+              <!--
+                 NORSPEC-182, ensure item doesn't show up in menu until it should
                 <combo_box.item
                  label="Use texture"
                  name="Use texture"
                  value="Use texture" />
+                 -->
             </combo_box>
             <text
              type="string"
-- 
cgit v1.2.3


From ef69d31b993fe849526799f225dd0eda12c82dab Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 29 May 2013 15:53:36 +0300
Subject: CHUI-918 FIXED "Close all conversations" menu item is added to
 context menu.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 5a13ef0a59..7494309315 100755
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -12,6 +12,12 @@
      name="close_conversation">
         <on_click function="Avatar.DoToSelected" parameter="close_conversation"/>
 	 </menu_item_call>
+	 <menu_item_call
+     label="Close All conversations"
+     layout="topleft"
+     name="close_all_conversations">
+        <on_click function="Avatar.DoToSelected" parameter="close_all_conversations"/>
+	 </menu_item_call>
      <menu_item_call
      label="Open voice conversation"
      layout="topleft"
-- 
cgit v1.2.3


From 430af6f731b2b822dd91d3163d7e206e3559a211 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 4 Jun 2013 14:49:07 +0300
Subject: CHUI-918 FIXED Close only selected conversations instead of closing
 all conversations.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 7494309315..b3d28788da 100755
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -11,13 +11,7 @@
      layout="topleft"
      name="close_conversation">
         <on_click function="Avatar.DoToSelected" parameter="close_conversation"/>
-	 </menu_item_call>
-	 <menu_item_call
-     label="Close All conversations"
-     layout="topleft"
-     name="close_all_conversations">
-        <on_click function="Avatar.DoToSelected" parameter="close_all_conversations"/>
-	 </menu_item_call>
+	 </menu_item_call>	 
      <menu_item_call
      label="Open voice conversation"
      layout="topleft"
@@ -31,6 +25,12 @@
         <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/>
     </menu_item_call>	
 	<menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/>	
+	<menu_item_call
+     label="Close Selected"
+     layout="topleft"
+     name="close_selected_conversations">
+        <on_click function="Avatar.DoToSelected" parameter="close_selected_conversations"/>
+	 </menu_item_call>
     <menu_item_call
      label="View Profile"
      layout="topleft"
-- 
cgit v1.2.3


From d5d8fd674ec6c81021e2921f71d7b98a45b2db84 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 5 Jun 2013 16:31:49 +0300
Subject: CHUI-968 FIXED "name" attribute was added for panels

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 2fd26e3f01..8e867259c5 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -14,6 +14,7 @@
       border="false"
       height="60"
       layout="topleft"
+      name="general_chat_settings" 
       top="10"
       left="13"
       width="517">
@@ -97,6 +98,7 @@
       border="false"
       height="165"
       layout="topleft"
+      name="im_notification_settings" 	
       left="13"
       width="517">
 
@@ -382,6 +384,7 @@
       border="false"
       height="50"
       layout="topleft"
+      name="play_sound_settings"  	
       left="13"
       top_pad="10"
       width="517">
@@ -444,6 +447,7 @@
   <panel
       height="50"
       layout="topleft"
+      name="log_settings" 	
       left="13"
       top_pad="10"
       width="505">
-- 
cgit v1.2.3


From 497789c47632f1d1756832c3231d7d4ca5b84c11 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 6 Jun 2013 19:00:11 +0300
Subject: CHUI-973 FIXED Speaking indicator was removed

---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 8da4213c65..43d0f2fb18 100755
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -142,19 +142,7 @@
                  left_pad="2"
                  name="voice_call_btn"
                  tool_tip="Open voice connection"
-                 width="31"/>
-                <output_monitor
-                 auto_update="true"
-                 follows="top|left"
-                 draw_border="false"
-                 height="16"
-                 layout="topleft"
-                 top="10"
-                 left_pad="10"
-                 mouse_opaque="true"
-                 name="speaking_indicator"
-                 visible="false"
-                 width="20" />
+                 width="31"/>                
                 <button
                  follows="right|top"
                  height="25"
-- 
cgit v1.2.3


From 64fc027a0bd87be0629ef95a5b7d0ab736c97a9e Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 6 Jun 2013 19:11:28 +0300
Subject: CHUI-975 FIXED Message text is changed

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9d1973f267..7c4ad2b819 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5954,9 +5954,7 @@ Your calling card was declined.
    icon="notifytip.tga"
    name="TeleportToPerson"
    type="notifytip">
-    To contact Residents like &apos;[NAME]&apos;, click on the &quot;People&quot; button , select a Resident from the window that opens, then click &apos;IM&apos; at the
-    bottom of the window.
-    (You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
+    To open a private conversation with someone, right-click on their avatar and choose "IM" from the menu.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From d952a1b5fc883debc12d64f78a9df43987976499 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 6 Jun 2013 19:15:49 +0300
Subject: CHUI-975 Fixed apostrophes

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7c4ad2b819..6ed5f6b2cc 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5954,7 +5954,7 @@ Your calling card was declined.
    icon="notifytip.tga"
    name="TeleportToPerson"
    type="notifytip">
-    To open a private conversation with someone, right-click on their avatar and choose "IM" from the menu.
+    To open a private conversation with someone, right-click on their avatar and choose &apos;IM&apos; from the menu.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 45f3ca1667f404190ff2bb762f39cedd58ef7abb Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 10 Jun 2013 17:37:19 +0300
Subject: CHUI-866 FIXED Disable menu item if Conversation Logging isn't
 allowed.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index dde9432867..8790fde7c5 100755
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -44,6 +44,8 @@
     <menu_item_check.on_check
      function="Floater.Visible"
      parameter="conversation" />
+    <menu_item_check.on_enable
+     function="Conversation.IsConversationLoggingAllowed" />
     <menu_item_check.on_click
      function="Floater.Toggle"
      parameter="conversation" />
-- 
cgit v1.2.3


From 4f7b8a7e861ee25f1e0f7b0df2e9c8372254f46d Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Tue, 11 Jun 2013 18:54:54 -0600
Subject: STORM-1952: Add a confirmation modal when ejecting a member from a
 group

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 970a11c6c4..620154fe51 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -506,6 +506,33 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
+  
+  <notification
+    icon="alertmodal.tga"
+    name="EjectGroupMemberWarning"
+    type="alertmodal">
+     You are about to eject [AVATAR_NAME] from the group.
+     <tag>group</tag>
+     <tag>confirm</tag>
+     <usetemplate
+      ignoretext="Confirm ejecting a participant from group"
+      name="okcancelignore"
+      notext="Cancel"
+      yestext="Eject"/>
+  </notification>
+  <notification
+    icon="alertmodal.tga"
+    name="EjectGroupMembersWarning"
+    type="alertmodal">
+     You are about to eject [COUNT] members from the group.
+     <tag>group</tag>
+     <tag>confirm</tag>
+     <usetemplate
+      ignoretext="Confirm ejecting multiple members from group"
+      name="okcancelignore"
+      notext="Cancel"
+      yestext="Eject"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 882ab04ef3e412716f0f034e348007b5f3016f3c Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Thu, 13 Jun 2013 20:21:24 +0300
Subject: CHUI-809 (Right-click menu on user name in compat chat mode doesn't
 have "IM") Added callback for friendship checking

---
 indra/newview/skins/default/xui/en/menu_url_agent.xml | 9 ++++++++-
 indra/newview/skins/default/xui/en/strings.xml        | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index 7cd56f257a..e8b6116026 100755
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -21,8 +21,15 @@
      layout="topleft"
      name="add_friend">
         <menu_item_call.on_click
-         function="Url.AddFriend" />        
+         function="Url.AddFriend" />
     </menu_item_call>
+    <menu_item_call
+     label="Remove Friend..."
+     layout="topleft"
+     name="remove_friend">
+        <menu_item_call.on_click
+         function="Url.RemoveFriend" />
+        </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3b57ff5fd6..521aed698a 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -209,7 +209,8 @@ Please try logging in again in a minute.</string>
 	<string name="SLappAgentIM">IM</string>
 	<string name="SLappAgentPay">Pay</string>
 	<string name="SLappAgentOfferTeleport">Offer Teleport to </string>
-	<string name="SLappAgentRequestFriend">Friend Request </string>
+	<string name="SLappAgentRequestFriend">Friend Request</string>
+  <string name="SLappAgentRemoveFriend">Friend Removal</string>
 
 	<!-- ButtonToolTips, llfloater.cpp -->
 	<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;W)</string>
-- 
cgit v1.2.3


From 9b23298970e930aff0f46b70724eaf110cb05d81 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 13 Jun 2013 15:40:12 -0400
Subject: STORM-1953 Notifications that involve deleting something -- errors in
 text

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 970a11c6c4..4cad8482d0 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2682,7 +2682,7 @@ Please enter a higher price.
    icon="alertmodal.tga"
    name="ConfirmItemDeleteHasLinks"
    type="alertmodal">
-At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
+At least one of the items has links that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2724,7 +2724,7 @@ Are you sure you want to delete these items?
    icon="alertmodal.tga"
    name="ConfirmObjectDeleteNoOwn"
    type="alertmodal">
-You do not own least one of the items you have selected.
+You do not own at least one of the items you have selected.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2754,7 +2754,7 @@ Are you sure you want to delete these items?
    name="ConfirmObjectDeleteLockNoOwn"
    type="alertmodal">
 At least one object is locked.
-You do not own least one object.
+You do not own at least one object.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2769,7 +2769,7 @@ Are you sure you want to delete these items?
    name="ConfirmObjectDeleteNoCopyNoOwn"
    type="alertmodal">
 At least one object is not copyable.
-You do not own least one object.
+You do not own at least one object.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2785,13 +2785,13 @@ Are you sure you want to delete these items?
    type="alertmodal">
 At least one object is locked.
 At least one object is not copyable.
-You do not own least one object.
+You do not own at least one object.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
-     notext="cancel"
+     notext="Cancel"
      yestext="OK"/>
   </notification>
 
-- 
cgit v1.2.3


From 2b8beeeff1485682e2b47f330dc8b3c24e966961 Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Thu, 20 Jun 2013 12:45:22 +0300
Subject: CHUI-809 (Right-click menu on user name in compat chat mode doesn't
 have "IM") Fixed "Add friend" option always being greyed out, add ability to
 block object via context menu in compact chat mode.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
index 87ab58e622..b9d003b841 100755
--- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -9,6 +9,13 @@
         <menu_item_call.on_click
          function="Url.Execute" />
     </menu_item_call>
+    <menu_item_call
+     label="Block..."
+     layout="topleft"
+     name="block_object">
+        <menu_item_call.on_click
+         function="Url.Block" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-- 
cgit v1.2.3


From 13361137d0d2ccb750d6002826763579d3d1cc69 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 9 Jul 2013 15:13:38 +0300
Subject: CHUI-978 FIXED Load data from chat log file in separate thread to
 prevent viewer freeze

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index dcd2bf5ba7..f1e551695f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3928,5 +3928,8 @@ Try enclosing path to the editor with double quotes.
   <string name="logging_calls_enabled_log_empty">
     There are no logged conversations. After you contact someone, or someone contacts you, a log entry will be shown here.
   </string>
+  <string name="loading_chat_logs">
+    Loading...
+  </string>
   
   </strings>
-- 
cgit v1.2.3


From c71b02b743c41b00970425da14ceb437370aeaf8 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 2 Jul 2013 10:15:41 -0400
Subject: CHOP-959: Report region-local position in Help -> About box. I've
 never really understood the usefulness of displaying world-global coordinates
 in the Help -> About box. It seems to me far more useful to know where you
 are within the current region. If that proves problematic, we can display
 both sets of coordinates -- but let's try it this way first.

---
 indra/newview/skins/default/xui/da/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/de/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/es/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/fr/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/it/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/ja/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/pl/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/pt/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/ru/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/tr/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/zh/floater_about.xml | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index fc8bc33096..9206690c8f 100755
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -8,7 +8,7 @@
 		Bygget med [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Du er ved [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 4387a61963..5245467183 100755
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -8,7 +8,7 @@
 		Kompiliert mit [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Sie befinden sich in [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Sie befinden sich in [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])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 63eb87f27a..d9e4b5b70c 100755
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -22,7 +22,7 @@ Built with [COMPILER] version [COMPILER_VERSION]
 </floater.string>
   <floater.string
      name="AboutPosition">
-You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 3696c7e12c..7ca1e3721f 100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -8,7 +8,7 @@
 		Compilado con [COMPILER], versión [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Estás en la posición [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1], de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		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])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index a659cb4245..d45bdccf3e 100755
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -8,7 +8,7 @@
 		Compilé avec [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		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])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index c672511fc5..b0fb585fa2 100755
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -8,7 +8,7 @@
 		Generato con [COMPILER] versione [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Tu sei  [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Tu sei  [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])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 6d5df75645..eae52c98ec 100755
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -8,7 +8,7 @@
 		コンパイラー [COMPILER] [COMPILER_VERSION] バージョン
 	</floater.string>
 	<floater.string name="AboutPosition">
-		あなたの現在地は、[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
+		あなたの現在地は、[POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
index 409429ffaa..61a72ff27d 100755
--- a/indra/newview/skins/default/xui/pl/floater_about.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -8,7 +8,7 @@
 		Buduj z [COMPILER] wersją [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Położenie [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Położenie [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 299f88b22a..d089266342 100755
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -7,7 +7,7 @@
 		Construído com [COMPILER] versão [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME]&lt;/nolink&gt;([HOSTIP])
+		Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em [HOSTNAME]&lt;/nolink&gt;([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index bb6266ac9a..2b2b3cf453 100755
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -8,7 +8,7 @@
 		Использован компилятор [COMPILER], версия [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Вы в точке [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Вы в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 9cc9c7a220..4dcf6200c6 100755
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -8,7 +8,7 @@
 		[COMPILER] [COMPILER_VERSION] sürümü ile oluşturuldu
 	</floater.string>
 	<floater.string name="AboutPosition">
-		&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] konumundasınız
+		&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
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 643881e416..1193243c7e 100755
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -8,7 +8,7 @@
 		以 [COMPILER_VERSION] 版本 [COMPILER] 建置
 	</floater.string>
 	<floater.string name="AboutPosition">
-		你的方位是 [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]，地區名：[REGION]，主機：&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		你的方位是 [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地區名：[REGION]，主機：&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
-- 
cgit v1.2.3


From e589f47e5e0a711ecb3045f3ed1335a721f39192 Mon Sep 17 00:00:00 2001
From: Maestro Linden <maestro@lindenlab.com>
Date: Tue, 2 Jul 2013 18:41:03 +0000
Subject: MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and
 corrected related tooltips

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ef01f27da2..fb1846860c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -646,11 +646,11 @@ Returns the wind velocity at the object position + offset
 	</string>
 	<string name="LSLTipText_llSetStatus" translate="false">
 llSetStatus(integer status, integer value)
-Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
 	</string>
 	<string name="LSLTipText_llGetStatus" translate="false">
 integer llGetStatus(integer status)
-Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
+Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
 	</string>
 	<string name="LSLTipText_llSetScale" translate="false">
 llSetScale(vector scale)
-- 
cgit v1.2.3


From 5d7be3a4987c603500bbe3733870a378bd9eda92 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 8 Jul 2013 10:46:21 -0700
Subject: NORSPEC-300 stop-gap measure of clamping offsets > 0 until
 server-side fix to store negative values can be released

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 5ac2ec2b20..426c0c4915 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -663,7 +663,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="bumpyOffsetU"
              width="265" />
             <spinner
@@ -674,7 +674,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="bumpyOffsetV"
              width="265" />
             <spinner
@@ -726,7 +726,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="shinyOffsetU"
              width="265" />
             <spinner
@@ -737,7 +737,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="shinyOffsetV"
              width="265" />
             <check_box
-- 
cgit v1.2.3


From 879dfd161ef19f73371b69e5db6b044f8b118ca1 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 11 Jul 2013 19:42:43 -0400
Subject: CHOP-959: Re-add global coordinates, plus SLURL, to About box.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index d9e4b5b70c..703015af20 100755
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -23,6 +23,8 @@ Built with [COMPILER] version [COMPILER_VERSION]
   <floater.string
      name="AboutPosition">
 You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 
-- 
cgit v1.2.3


From 7766129495a9ac447ca2ccf44d631481d2cea911 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Fri, 12 Jul 2013 19:51:22 +0300
Subject: MAINT-2875 FIXED Shortcut was changed and menu item was added.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 39fd519c70..db45e515ad 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -93,7 +93,7 @@
         <menu_item_check
          label="Fly"
          name="Fly"
-         shortcut="Home">
+         shortcut="PGUP">
           <menu_item_check.on_check
            function="Agent.getFlying" />
           <menu_item_check.on_click
@@ -101,6 +101,15 @@
           <menu_item_check.on_enable
            function="Agent.enableFlying" />
         </menu_item_check>
+        <menu_item_call
+         label="Stop flying"
+         name="Stop flying"
+         shortcut="PGDN">
+          <menu_item_call.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_call.on_enable
+           function="Agent.getFlying" />
+        </menu_item_call>	
         <menu_item_check
          label="Always Run"
          name="Always Run"
-- 
cgit v1.2.3


From 570884d73007aea2438f3faa1181129a16bad359 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Thu, 1 Aug 2013 12:46:14 -0700
Subject: MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"

---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_attachment_self.xml  | 2 +-
 indra/newview/skins/default/xui/en/menu_avatar_other.xml     | 2 +-
 indra/newview/skins/default/xui/en/menu_avatar_self.xml      | 2 +-
 indra/newview/skins/default/xui/en/menu_land.xml             | 2 +-
 indra/newview/skins/default/xui/en/menu_mute_particle.xml    | 2 +-
 indra/newview/skins/default/xui/en/menu_object.xml           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

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

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 a8012656c2..0a8beec7de 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -116,7 +116,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
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 500a5dc6d1..bcbc8d5b86 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -147,7 +147,7 @@ name="Edit Outfit">
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
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 bca9ba5a56..8be2683680 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -107,7 +107,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
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 362dca698f..ca0c9bd5e4 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -273,7 +273,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index 7b40e89535..2ad5cbbe95 100755
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -65,7 +65,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
diff --git a/indra/newview/skins/default/xui/en/menu_mute_particle.xml b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
index 41d5613623..a4261bf39e 100644
--- a/indra/newview/skins/default/xui/en/menu_mute_particle.xml
+++ b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
@@ -5,7 +5,7 @@
  name="Mute Particle Pie">
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 97b24d2aba..52ab7da515 100755
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -200,7 +200,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Mute Particle Owner"
+     label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-- 
cgit v1.2.3


From 996ed16fa1b3eb005c90b67f8ea363fd423ef711 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 11 Sep 2013 15:15:34 -0700
Subject: FIX INTL-123 translation of Viewer Set36 for 9 languages (changed and
 new files)

---
 .../newview/skins/default/xui/de/floater_about.xml |   4 +-
 .../skins/default/xui/de/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/de/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/de/floater_im_session.xml    |  12 +--
 .../default/xui/de/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/de/menu_attachment_other.xml |   2 +
 .../skins/default/xui/de/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/de/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/de/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/de/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/de/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/de/menu_login.xml  |   8 +-
 .../skins/default/xui/de/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/de/menu_object.xml |   5 +-
 .../skins/default/xui/de/menu_url_agent.xml        |   1 +
 .../skins/default/xui/de/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/de/menu_viewer.xml |  15 ++-
 .../newview/skins/default/xui/de/notifications.xml |  71 +++++++++++--
 .../newview/skins/default/xui/de/panel_people.xml  |   3 +
 .../default/xui/de/panel_preferences_chat.xml      |  44 +++++---
 .../default/xui/de/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/de/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/de/panel_script_ed.xml       |   1 +
 .../skins/default/xui/de/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/de/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/de/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/es/floater_about.xml |   4 +-
 .../skins/default/xui/es/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/es/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/es/floater_im_session.xml    |  12 +--
 .../default/xui/es/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/es/menu_attachment_other.xml |   2 +
 .../skins/default/xui/es/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/es/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/es/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/es/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/es/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/es/menu_login.xml  |   8 +-
 .../skins/default/xui/es/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/es/menu_object.xml |   5 +-
 .../skins/default/xui/es/menu_url_agent.xml        |   1 +
 .../skins/default/xui/es/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/es/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/es/notifications.xml |  87 ++++++++++++----
 .../newview/skins/default/xui/es/panel_people.xml  |   3 +
 .../default/xui/es/panel_preferences_chat.xml      |  70 +++++++------
 .../default/xui/es/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/es/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/es/panel_script_ed.xml       |   1 +
 .../skins/default/xui/es/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/es/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/es/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/fr/floater_about.xml |   2 +
 .../skins/default/xui/fr/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/fr/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/fr/floater_im_session.xml    |  12 +--
 .../default/xui/fr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/fr/menu_attachment_other.xml |   2 +
 .../skins/default/xui/fr/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/fr/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/fr/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/fr/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/fr/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/fr/menu_login.xml  |   8 +-
 .../skins/default/xui/fr/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/fr/menu_object.xml |   5 +-
 .../skins/default/xui/fr/menu_url_agent.xml        |   1 +
 .../skins/default/xui/fr/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/fr/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/fr/notifications.xml |  73 ++++++++++---
 .../newview/skins/default/xui/fr/panel_people.xml  |   3 +
 .../default/xui/fr/panel_preferences_chat.xml      |  46 +++++---
 .../default/xui/fr/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/fr/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/fr/panel_script_ed.xml       |   1 +
 .../skins/default/xui/fr/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/fr/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/fr/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/it/floater_about.xml |   4 +-
 .../skins/default/xui/it/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/it/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/it/floater_im_session.xml    |  12 +--
 .../default/xui/it/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/it/menu_attachment_other.xml |   2 +
 .../skins/default/xui/it/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/it/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/it/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/it/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/it/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/it/menu_login.xml  |   8 +-
 .../skins/default/xui/it/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/it/menu_object.xml |   5 +-
 .../skins/default/xui/it/menu_url_agent.xml        |   1 +
 .../skins/default/xui/it/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/it/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/it/notifications.xml |  79 +++++++++++---
 .../newview/skins/default/xui/it/panel_people.xml  |   3 +
 .../default/xui/it/panel_preferences_chat.xml      |  40 ++++---
 .../default/xui/it/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/it/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/it/panel_script_ed.xml       |   1 +
 .../skins/default/xui/it/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/it/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/it/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/ja/floater_about.xml |   4 +-
 .../skins/default/xui/ja/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/ja/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/ja/floater_im_session.xml    |  12 +--
 .../default/xui/ja/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ja/menu_attachment_other.xml |   2 +
 .../skins/default/xui/ja/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/ja/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/ja/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/ja/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/ja/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/ja/menu_login.xml  |   8 +-
 .../skins/default/xui/ja/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/ja/menu_object.xml |   5 +-
 .../skins/default/xui/ja/menu_url_agent.xml        |   1 +
 .../skins/default/xui/ja/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/ja/notifications.xml |  87 ++++++++++++----
 .../newview/skins/default/xui/ja/panel_people.xml  |   3 +
 .../default/xui/ja/panel_preferences_chat.xml      |  84 ++++++++-------
 .../default/xui/ja/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/ja/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/ja/panel_script_ed.xml       |   1 +
 .../skins/default/xui/ja/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/ja/role_actions.xml  |   4 +-
 indra/newview/skins/default/xui/ja/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/pt/floater_about.xml |   4 +-
 .../skins/default/xui/pt/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/pt/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/pt/floater_im_session.xml    |  12 +--
 .../default/xui/pt/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/pt/menu_attachment_other.xml |   2 +
 .../skins/default/xui/pt/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/pt/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/pt/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/pt/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/pt/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/pt/menu_login.xml  |   8 +-
 .../skins/default/xui/pt/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/pt/menu_object.xml |   5 +-
 .../skins/default/xui/pt/menu_url_agent.xml        |   1 +
 .../skins/default/xui/pt/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/pt/notifications.xml |  83 ++++++++++++---
 .../newview/skins/default/xui/pt/panel_people.xml  |   3 +
 .../default/xui/pt/panel_preferences_chat.xml      |  66 +++++++-----
 .../default/xui/pt/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/pt/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/pt/panel_script_ed.xml       |   1 +
 .../skins/default/xui/pt/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/pt/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/pt/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/ru/floater_about.xml |   2 +
 .../skins/default/xui/ru/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/ru/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/ru/floater_im_session.xml    |  12 +--
 .../default/xui/ru/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/ru/menu_attachment_other.xml |   2 +
 .../skins/default/xui/ru/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/ru/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/ru/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/ru/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/ru/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/ru/menu_login.xml  |   8 +-
 .../skins/default/xui/ru/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/ru/menu_object.xml |   5 +-
 .../skins/default/xui/ru/menu_url_agent.xml        |   1 +
 .../skins/default/xui/ru/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  16 +--
 .../newview/skins/default/xui/ru/notifications.xml |  61 +++++++++--
 .../newview/skins/default/xui/ru/panel_people.xml  |   3 +
 .../default/xui/ru/panel_preferences_chat.xml      |  38 ++++---
 .../default/xui/ru/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/ru/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/ru/panel_script_ed.xml       |   1 +
 .../skins/default/xui/ru/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/ru/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/ru/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/tr/floater_about.xml |   2 +
 .../skins/default/xui/tr/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/tr/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/tr/floater_im_session.xml    |  12 +--
 .../default/xui/tr/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/tr/menu_attachment_other.xml |   2 +
 .../skins/default/xui/tr/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/tr/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/tr/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/tr/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/tr/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/tr/menu_login.xml  |   8 +-
 .../skins/default/xui/tr/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/tr/menu_object.xml |   5 +-
 .../skins/default/xui/tr/menu_url_agent.xml        |   1 +
 .../skins/default/xui/tr/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/tr/notifications.xml |  65 ++++++++++--
 .../newview/skins/default/xui/tr/panel_people.xml  |   3 +
 .../default/xui/tr/panel_preferences_chat.xml      |  44 +++++---
 .../default/xui/tr/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/tr/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/tr/panel_script_ed.xml       |   1 +
 .../skins/default/xui/tr/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/tr/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/tr/strings.xml     |  36 +++++++
 .../newview/skins/default/xui/zh/floater_about.xml |   2 +
 .../skins/default/xui/zh/floater_bulk_perms.xml    |   7 +-
 .../skins/default/xui/zh/floater_goto_line.xml     |   7 ++
 .../skins/default/xui/zh/floater_im_session.xml    |  12 +--
 .../default/xui/zh/floater_pathfinding_console.xml |   2 +-
 .../skins/default/xui/zh/menu_attachment_other.xml |   2 +
 .../skins/default/xui/zh/menu_attachment_self.xml  |   2 +
 .../skins/default/xui/zh/menu_avatar_other.xml     |   2 +
 .../skins/default/xui/zh/menu_avatar_self.xml      |   2 +
 .../skins/default/xui/zh/menu_conversation.xml     |   1 +
 indra/newview/skins/default/xui/zh/menu_land.xml   |   1 +
 indra/newview/skins/default/xui/zh/menu_login.xml  |   8 +-
 .../skins/default/xui/zh/menu_mute_particle.xml    |   5 +
 indra/newview/skins/default/xui/zh/menu_object.xml |   5 +-
 .../skins/default/xui/zh/menu_url_agent.xml        |   1 +
 .../skins/default/xui/zh/menu_url_objectim.xml     |   1 +
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  14 ++-
 .../newview/skins/default/xui/zh/notifications.xml |  57 +++++++++-
 .../newview/skins/default/xui/zh/panel_people.xml  |   3 +
 .../default/xui/zh/panel_preferences_chat.xml      |  46 +++++---
 .../default/xui/zh/panel_preferences_graphics1.xml |   2 +-
 .../default/xui/zh/panel_preferences_setup.xml     |   1 +
 .../skins/default/xui/zh/panel_script_ed.xml       |   1 +
 .../skins/default/xui/zh/panel_tools_texture.xml   | 116 +++++++++++++++++++++
 .../newview/skins/default/xui/zh/role_actions.xml  |   2 +-
 indra/newview/skins/default/xui/zh/strings.xml     |  36 +++++++
 234 files changed, 2788 insertions(+), 483 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_tools_texture.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_goto_line.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_mute_particle.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_tools_texture.xml

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

diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 5245467183..bc0eae7c5d 100755
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -8,7 +8,9 @@
 		Kompiliert mit [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Sie befinden sich in [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])
+		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;
+(globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
index 8f99fc933c..27a74c874e 100755
--- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="BERECHTIGUNGEN BEARBEITEN">
+<floater name="floaterbulkperms" title="INHALTSBERECHTIGUNGEN ÄNDERN">
 	<floater.string name="nothing_to_modify_text">
 		Auswahl enthält keinen Inhalt, der bearbeitet werden kann.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Alle" label_selected="Alle" name="check_all"/>
 	<button label="Löschen" label_selected="Keine" name="check_none"/>
 	<text name="newperms">
-		Neue Inhalts-Berechtigungen
+		Inhaltsberechtigungen ändern in
 	</text>
 	<text name="GroupLabel">
 		Gruppe:
@@ -49,6 +49,7 @@
 	<check_box label="Bearbeiten" name="next_owner_modify"/>
 	<check_box label="Kopieren" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transferieren" name="next_owner_transfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Anwenden" name="apply"/>
 	<button label="Abbrechen" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_goto_line.xml b/indra/newview/skins/default/xui/de/floater_goto_line.xml
new file mode 100644
index 0000000000..02550ec398
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="GEHE ZU ZEILE">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Gehe zu Zeile
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index f96eb72cb1..b07b74bf4a 100755
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index 88e9f53a4c..ebf8f01632 100755
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Anzeigen:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Welt" name="show_world"/>
 			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 237c92f7d2..4c125c8b5d 100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Einfrieren" name="Freeze..."/>
 	<menu_item_call label="Hinauswerfen" name="Eject..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
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 325d52a22e..7888c7b0a1 100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Fallen lassen" name="Drop"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
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 8aee0be3d2..65dc054ed5 100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Einfrieren" name="Freeze..."/>
 	<menu_item_call label="Hinauswerfen" name="Eject..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
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 c49f4b198b..022cd8c3ca 100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="XML ausgeben" name="Dump XML"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
index 30d3ab79e1..bdfa66c23b 100644
--- a/indra/newview/skins/default/xui/de/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/de/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
 	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
 	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
+	<menu_item_call label="Ausgewählte schließen" name="close_selected_conversations"/>
 	<menu_item_call label="Profil anzeigen" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml
index de679da3d8..0bbf8c666e 100755
--- a/indra/newview/skins/default/xui/de/menu_land.xml
+++ b/indra/newview/skins/default/xui/de/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Pass kaufen" name="Land Buy Pass"/>
 	<menu_item_call label="Bauen" name="Create"/>
 	<menu_item_call label="Land bearbeiten" name="Edit Terrain"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index b43b41a5dc..62358cc5a8 100755
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Servicebedingungen anzeigen" name="TOS"/>
 		<menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/>
 		<menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"/>
-		<menu label="Protokollierungsstufe festlegen" name="Set Logging Level"/>
+		<menu label="Protokollierungsstufe festlegen" name="Set Logging Level">
+			<menu_item_check label="Debug" name="Debug"/>
+			<menu_item_check label="Info" name="Info"/>
+			<menu_item_check label="Warnung" name="Warning"/>
+			<menu_item_check label="Fehler" name="Error"/>
+			<menu_item_check label="Keine" name="None"/>
+		</menu>
 		<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
 		<menu_item_call label="Benachrichtigungs-Konsole anzeigen" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_mute_particle.xml b/indra/newview/skins/default/xui/de/menu_mute_particle.xml
new file mode 100644
index 0000000000..ea8ae03ee0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 9f44ced928..de2b409678 100755
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -5,13 +5,13 @@
 	</menu_item_call>
 	<menu_item_call label="Bearbeiten" name="Edit..."/>
 	<menu_item_call label="Bauen" name="Build"/>
-	<menu_item_call label="In Linksets anzeigen" name="show_in_linksets"/>
-	<menu_item_call label="In Figuren anzeigen" name="show_in_characters"/>
 	<menu_item_call label="Öffnen" name="Open"/>
 	<menu_item_call label="Hier sitzen" name="Object Sit"/>
 	<menu_item_call label="Aufstehen" name="Object Stand Up"/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
+	<menu_item_call label="In Linksets anzeigen" name="show_in_linksets"/>
+	<menu_item_call label="In Figuren anzeigen" name="show_in_characters"/>
 	<context_menu label="Anziehen" name="Put On">
 		<menu_item_call label="Anziehen" name="Wear"/>
 		<menu_item_call label="Hinzufügen" name="Add"/>
@@ -28,4 +28,5 @@
 	<menu_item_call label="Bezahlen" name="Pay..."/>
 	<menu_item_call label="Kaufen" name="Buy..."/>
 	<menu_item_call label="Löschen" name="Delete"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index c61ebb0eae..ddb072ba8f 100755
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Profil anzeigen" name="show_agent"/>
 	<menu_item_call label="IM senden..." name="send_im"/>
 	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
+	<menu_item_call label="Freund entfernen..." name="remove_friend"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 77b7004e44..fc01ea8444 100755
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Objektprofil..." name="show_object"/>
+	<menu_item_call label="Blockieren..." name="block_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 47d9fec352..be5d4891d7 100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status"/>
+		<menu label="Status" name="Status">
+			<menu_item_check label="Abwesend" name="Away"/>
+			<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="Kontoübersicht..." name="Manage My Account">
@@ -32,6 +35,7 @@
 		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
 		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
+		<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation Log..."/>
 		<menu label="Voice-Morphing" name="VoiceMorphing">
 			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
 			<menu_item_check label="Vorschau..." name="Preview"/>
@@ -42,6 +46,7 @@
 		<menu_item_check label="Gruppen" name="My Groups"/>
 		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
+		<menu_item_check label="Nicht stören" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Welt" name="World">
 		<menu_item_call label="Landmarke für diesen Ort setzen" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
 			<menu_item_call label="Nächsten Teil mit einsschließen" name="Include Next Part"/>
 			<menu_item_call label="Vorherige Teile mit einschließen" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
 		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
 		<menu label="Objekt" name="Object">
@@ -279,6 +285,7 @@
 			<menu_item_check label="Framerate randomisieren" name="Randomize Framerate"/>
 			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
 			<menu_item_check label="Frame-Test" name="Frame Test"/>
+			<menu_item_call label="Rahmenprofil" name="Frame Profile"/>
 		</menu>
 		<menu label="Metadaten darstellen" name="Render Metadata">
 			<menu_item_check label="Bonding Boxes" name="Bounding Boxes"/>
@@ -313,9 +320,10 @@
 			<menu_item_check label="Achsen" name="Axes"/>
 			<menu_item_check label="Tangentenbasis" name="Tangent Basis"/>
 			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Ausgewählte Materialinfos" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
 			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Uber Licht Modell" name="Advanced Lighting Model"/>
+			<menu_item_check label="Erweitertes Beleuchtungsmodell" name="Advanced Lighting Model"/>
 			<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
@@ -325,7 +333,6 @@
 			<menu_item_check label="Animationstexturen" name="Animation Textures"/>
 			<menu_item_check label="Texturen deaktivieren" name="Disable Textures"/>
 			<menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/>
-			<menu_item_check label="Textur-Atlas (experimentell)" name="Texture Atlas"/>
 			<menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/>
 			<menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/>
 			<menu_item_check label="Leucht-Objekte schweben lassen" name="Hover Glow Objects"/>
@@ -361,7 +368,6 @@
 			<menu_item_call label="Fokus ausgeben" name="Dump Focus Holder"/>
 			<menu_item_call label="Ausgewählte Objektinfo drucken" name="Print Selected Object Info"/>
 			<menu_item_call label="Agent-Info drucken" name="Print Agent Info"/>
-			<menu_item_call label="Speicher-Stats" name="Memory Stats"/>
 			<menu_item_check label="Regions-Debug-Konsole" name="Region Debug Console"/>
 			<menu_item_check label="Fehler in SelectMgr beseitigen" name="Debug SelectMgr"/>
 			<menu_item_check label="Fehler in Klicks beseitigen" name="Debug Clicks"/>
@@ -395,7 +401,6 @@
 			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
 			<menu_item_check label="Animations-Info" name="Animation Info"/>
-			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
 			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
 			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
 			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index dc0d7dc6b4..b3ae98f633 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -146,7 +146,7 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
 		<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Alles speichern"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
-		Leute, die nicht auf Ihrer Freundesliste stehen, werden nicht wissen, dass Sie deren Anrufe oder Sofortnachrichten ignoriert haben.
+		Personen, die nicht auf Ihrer Freundesliste stehen, werden nicht informiert, dass Sie ihre Anrufe und Instant Messages ignorieren.
 		<usetemplate name="okbutton" yestext="Ja"/>
 	</notification>
 	<notification name="FavoritesOnLogin">
@@ -216,6 +216,14 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Sie sind dabei, [AVATAR_NAME] aus der Gruppe hinauszuwerfen.
+		<usetemplate ignoretext="Hinauswerfen eines einzelnen Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Sie sind dabei, [COUNT] Mitglieder aus der Gruppe hinauszuwerfen.
+		<usetemplate ignoretext="Hinauswerfen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Sie möchten Ihren Anhang wirklich fallen lassen?
 Möchten Sie fortfahren?
@@ -1124,7 +1132,7 @@ auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?
 Geben sie einen höheren Betrag ein.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Mindestens eines Ihrer ausgewählten Objekte verfügt über verknüpfte Objekte.  Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr.  Wir empfehlen Ihnen daher, diese Verknüpfungen zuerst zu löschen.
+		Auf mindestens eines der Objekte wird über Verknüpfungen Bezug genommen. Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr.  Wir empfehlen daher, diese Verknüpfungen zuerst zu löschen.
 
 Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -1142,9 +1150,9 @@ Möchten Sie diese Objekte löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		Mindestens eines der ausgewählten Objekt gehört nicht Ihnen.
+		Mindestens eines der ausgewählten Objekte gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1158,14 +1166,14 @@ Möchten Sie diese Objekte löschen?
 		Mindestens ein Objekt ist gesperrt.
 Mindestens ein Objekt gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
 		Mindestens ein Objekt kann nicht kopiert werden.
 Mindestens ein Objekt gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
@@ -1173,7 +1181,7 @@ Möchten Sie diese Objekte löschen?
 Mindestens ein Objekt kann nicht kopiert werden.
 Mindestens ein Objekt gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
@@ -1492,13 +1500,43 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Informationen zu diesem Update]
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Ein erforderliches Softwareupdate wurde heruntergeladen.
-Version [VERSION]
+Version [VERSION] [[INFO_URL] Infos zu diesem Update]
 
 Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+[[INFO_URL] Infos zu diesem Update]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Für Ihre [APP_NAME]-Installation wurde ein Update heruntergeladen.
+Version [VERSION] 
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Details zu diesem Update finden Sie [[INFO_URL] hier].
+		<usetemplate name="okcancelbuttons" notext="Später..." yestext="Jetzt installieren und [APP_NAME] neu starten"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Für Ihre [APP_NAME]-Installation wurde ein Update heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
+		<usetemplate name="okcancelbuttons" notext="Später..." yestext="Jetzt installieren und [APP_NAME] neu starten"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Ein erforderliches Softwareupdate wurde heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
+
+Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1549,6 +1587,10 @@ Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
 Diese Gruppe verlassen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		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="ConfirmKick">
 		Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/>
@@ -2410,9 +2452,7 @@ Wählen Sie ein einzelnes Objekt aus.
     „Teleportieren“ wählen.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Um Einwohner wie „[NAME]“ zu kontaktieren, klicken Sie auf die Schaltfläche „Leute“, wählen Sie eingeblendeten Fenster einen Einwohner aus
-    und klicken Sie unten im Fenster auf „IM“.
-    (Sie können auch auf den Namen doppelklicken bzw. ihn mit der rechten Maustaste anklicken und dann „IM“ wählen.)
+		Um eine private Unterhaltung zu beginnen, klicken Sie mit der rechten Maustaste auf den gewünschten Avatar und wählen Sie im Menü „IM“ aus.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Land kann nicht über Servergrenzen hinweg ausgewählt werden.
@@ -2786,6 +2826,15 @@ Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein s
 			<button name="Deny" text="Verweigern"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		Die Runtime-Skript-Berechtigung, die von „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ (Besitzer: „[NAME]“) angefordert wurde, wird vom Viewer nicht erkannt und kann nicht gewährt werden.
+
+Um diese Berechtigung zu gewähren, laden Sie die neueste Version des Viewers von [DOWNLOADURL] herunter.
+		<form name="form">
+			<button name="Deny" text="OK"/>
+			<button name="Mute" text="Blockieren"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		„&lt;nolink&gt;[TITLE]&lt;/nolink&gt;“ von [NAME]
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 8c05ca2c24..2d56d6b7d2 100755
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -49,6 +49,9 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
 				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
 			</panel>
+			<text name="groupcount">
+				Sie gehören [COUNT] Gruppen an und können [REMAINING] weiteren beitreten.
+			</text>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 8193fd42c1..8eb815fd1b 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<panel>
+	<panel name="general_chat_settings">
 		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
-		<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+		<check_box label="IMs per E-Mail zustellen, wenn ich offline bin" name="send_im_to_email"/>
 		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
 		<text name="font_size">
 			Schriftgröße:
@@ -14,10 +14,7 @@
 		</combo_box>
 		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Benachrichtigungen
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			IMs von Freunden:
 		</text>
@@ -25,8 +22,9 @@
 			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
 			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			IMs von anderen:
 		</text>
@@ -34,8 +32,9 @@
 			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
 			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			Konferenz-IMs:
 		</text>
@@ -43,8 +42,9 @@
 			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
 			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			Gruppen-Chat:
 		</text>
@@ -52,8 +52,9 @@
 			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
 			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			Chat in der Nähe:
 		</text>
@@ -61,25 +62,36 @@
 			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
 			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IMs von Objekten:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Sound abspielen:
 		</text>
 		<check_box label="Neue Unterhaltung" name="new_conversation"/>
-		<check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
+		<check_box label="Eingehender Anruf" name="incoming_voice_call"/>
 		<check_box label="Teleport-Angebot" name="teleport_offer"/>
 		<check_box label="Inventarangebot" name="inventory_offer"/>
 	</panel>
-	<panel>
+	<panel name="log_settings">
 		<button label="Protokoll löschen..." name="clear_log"/>
-		<button label="Protokolle löschen..." name="delete_transcripts"/>
-		<button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
+		<button label="Transkripte löschen..." name="delete_transcripts"/>
+		<button label="Durchsuchen..." label_selected="Durchblättern" name="log_path_button"/>
 	</panel>
 	<button label="Übersetzen..." name="ok_btn"/>
 	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
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 9175ea0bae..f3746a7c82 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
 		<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
 		<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Licht und Schatten" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
 		<check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 8c7ea688d7..24e5033bfc 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Automatisch installieren" name="Install_automatically"/>
 		<combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Bereit, Release-Kandidaten zu verwenden" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Proxy-Einstellungen:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml
index 7e03aeff15..d688bedd5c 100755
--- a/indra/newview/skins/default/xui/de/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Alle auswählen" name="Select All"/>
 			<menu_item_call label="Auswahl aufheben" name="Deselect"/>
 			<menu_item_call label="Suchen / Ersetzen..." name="Search / Replace..."/>
+			<menu_item_call label="Gehe zu Zeile..." name="Go to line..."/>
 		</menu>
 		<menu label="Hilfe" name="Help">
 			<menu_item_call label="Hilfe..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
new file mode 100644
index 0000000000..18517d7a7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Textur" name="Texture">
+	<panel.string name="string repeats per meter">
+		Wiederholungen pro Meter
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Wiederholungen pro Fläche
+	</panel.string>
+	<text name="color label">
+		Farbe
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	<text name="color trans">
+		Transparenz %
+	</text>
+	<text name="glow label">
+		Leuchten
+	</text>
+	<check_box label="Ganz hell" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Material" name="Materials"/>
+		<combo_box.item label="Medien" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Textur (diffus)" name="Texture (diffuse)"/>
+		<combo_box.item label="Unebenheit (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Glanzlicht (Spiegel)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
+	<text name="label alphamode">
+		Alpha-Modus
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Keiner" name="None"/>
+		<combo_box.item label="Alpha-Mischung" name="Alpha blending"/>
+		<combo_box.item label="Alpha-Maske" name="Alpha masking"/>
+		<combo_box.item label="Selbststrahlende Maske" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Maskenabgrenzung
+	</text>
+	<texture_picker label="Textur" name="bumpytexture control" tool_tip="Klicken, um ein Bild auszuwählen"/>
+	<text name="label bumpiness">
+		Unebenheit
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Keine" name="None"/>
+		<combo_box.item label="Helligkeit" name="Brightness"/>
+		<combo_box.item label="Dunkelheit" name="Darkness"/>
+		<combo_box.item label="Holzmaserung" name="woodgrain"/>
+		<combo_box.item label="Rinde" name="bark"/>
+		<combo_box.item label="Backsteine" name="bricks"/>
+		<combo_box.item label="Schachbrett" name="checker"/>
+		<combo_box.item label="Beton" name="concrete"/>
+		<combo_box.item label="Rostkachel" name="crustytile"/>
+		<combo_box.item label="Steinfliesen" name="cutstone"/>
+		<combo_box.item label="Scheiben" name="discs"/>
+		<combo_box.item label="Kies" name="gravel"/>
+		<combo_box.item label="Petrischale" name="petridish"/>
+		<combo_box.item label="Verkleidung" name="siding"/>
+		<combo_box.item label="Steinkachel" name="stonetile"/>
+		<combo_box.item label="Stuck" name="stucco"/>
+		<combo_box.item label="Saugkraft" name="suction"/>
+		<combo_box.item label="Gewebe" name="weave"/>
+	</combo_box>
+	<texture_picker label="Textur" name="shinytexture control" tool_tip="Klicken, um ein Bild auszuwählen"/>
+	<text name="label shininess">
+		Glanz
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Keiner" name="None"/>
+		<combo_box.item label="Niedrig" name="Low"/>
+		<combo_box.item label="Mittel" name="Medium"/>
+		<combo_box.item label="Hoch" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Glanz
+	</text>
+	<text name="label environment">
+		Umgebung
+	</text>
+	<text name="label shinycolor">
+		Farbe
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	<text name="media_info">
+		URL der ausgewählten Medien ggf. hier angeben
+	</text>
+	<button label="Auswählen..." name="add_media" tool_tip="Medien hinzufügen"/>
+	<button label="Entfernen" name="delete_media" tool_tip="Diese Medientextur löschen"/>
+	<button label="Ausrichten" label_selected="Medien ausrichten" name="button align" tool_tip="Medientextur ausrichten (muss zuerst geladen werden)"/>
+	<text name="tex gen">
+		Zuordnung
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Standard" name="Default"/>
+		<combo_box.item label="Planar" name="Planar"/>
+	</combo_box>
+	<spinner label="Horizontale Skalierung" name="TexScaleU"/>
+	<spinner label="Vertikale Skalierung" name="TexScaleV"/>
+	<spinner label="Wiederholungen pro Meter" name="rptctrl"/>
+	<spinner label="Drehung (Grad)" name="TexRot"/>
+	<spinner label="Horizontaler Versatz" name="TexOffsetU"/>
+	<spinner label="Vertikaler Versatz" name="TexOffsetV"/>
+	<spinner label="Horizontale Skalierung" name="bumpyScaleU"/>
+	<spinner label="Vertikale Skalierung" name="bumpyScaleV"/>
+	<spinner label="Drehung (Grad)" name="bumpyRot"/>
+	<spinner label="Horizontaler Versatz" name="bumpyOffsetU"/>
+	<spinner label="Vertikaler Versatz" name="bumpyOffsetV"/>
+	<spinner label="Horizontale Skalierung" name="shinyScaleU"/>
+	<spinner label="Vertikale Skalierung" name="shinyScaleV"/>
+	<spinner label="Drehung (Grad)" name="shinyRot"/>
+	<spinner label="Horizontaler Versatz" name="shinyOffsetU"/>
+	<spinner label="Vertikaler Versatz" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Planare Flächen ausrichten" name="checkbox planar align" tool_tip="Texturen auf allen ausgewählten Flächen an der zuletzt ausgewählten Fläche ausrichten. Erfordert planares Texture Mapping."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
index 5d9dcacd51..3e9d406e5f 100755
--- a/indra/newview/skins/default/xui/de/role_actions.xml
+++ b/indra/newview/skins/default/xui/de/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Diese Fähigkeiten ermöglichen es, den Parzellennamen und die Veröffentlichungseinstellungen sowie die Anzeige des Suchverzeichnisses, den Landepunkt und die TP-Routenoptionen festzulegen." name="Parcel Identity">
 		<action description="„Ort in Suche anzeigen&quot; ein-/ausschalten und Kategorie festlegen." longdescription="Auf der Registerkarte „Optionen“ unter „Land-Info“ können Sie „Ort in Suche anzeigen“ ein- und ausschalten und die Parzellenkategorie festlegen." name="land find places" value="17"/>
-		<action description="Parzellenname, Beschreibung und Einstellung für „Ort in Suche anzeigen&quot; ändern" longdescription="Parzellenname, Beschreibung und Einstellung für „Ort in Suche anzeigen&quot; ändern Diese Einstellungen finden Sie unter „Land-Info“ &gt; Registerkarte „Optionen“." name="land change identity" value="18"/>
+		<action description="Parzellenname, Beschreibung und Einstelllungen für „Moderater Inhalt“ ändern" longdescription="Parzellenname, Beschreibung und Einstelllungen für „Moderater Inhalt“ ändern. Diese Einstellungen finden Sie unter „Land-Info“ &gt; Registerkarte „Optionen“." name="land change identity" value="18"/>
 		<action description="Landepunkt und Teleport-Route festlegen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle einen Landepunkt für ankommende Teleports und Teleport-Routen festlegen. Diese Einstellungen finden Sie unter „Land-Info“ &gt; „Optionen“." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Diese Fähigkeiten ermöglichen es, Parzellenoptionen wie „Objekte erstellen“, „Terrain bearbeiten“ sowie Musik- und Medieneinstellungen zu ändern." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index e142cb8029..c8c20424e1 100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -139,6 +139,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
 http://secondlife.com/download
@@ -448,6 +451,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="SLappAgentRequestFriend">
 		Freundschaftsangebot
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Entfernen von Freunden
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Schließen (⌘W)
 	</string>
@@ -838,6 +844,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="multiple_textures">
 		Mehrfach
 	</string>
+	<string name="use_texture">
+		Textur verwenden
+	</string>
 	<string name="texture_loading">
 		Wird geladen...
 	</string>
@@ -937,6 +946,21 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="TeleportYourAgent">
 		Sie teleportieren
 	</string>
+	<string name="JoinAnExperience">
+		Bei einem Erlebnis mitmachen
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Beim Verwalten von Grundbesitzzugangslisten Warnhinweise unterdrücken
+	</string>
+	<string name="OverrideYourAnimations">
+		Ihre Standardanimationen ersetzen
+	</string>
+	<string name="ScriptReturnObjects">
+		Objekte in Ihrem Namen zurückgeben
+	</string>
+	<string name="UnknownScriptPermission">
+		(unbekannt)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1968,6 +1992,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD unten rechts
 	</string>
+	<string name="ATTACH_NECK">
+		Hals
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Avatar-Mitte
+	</string>
 	<string name="CursorPos">
 		Zeile [LINE], Spalte [COLUMN]
 	</string>
@@ -2997,6 +3027,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Hip Width">
 		Breite der Hüfte
 	</string>
+	<string name="Hover">
+		Schweben
+	</string>
 	<string name="In">
 		In
 	</string>
@@ -5081,4 +5114,7 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="logging_calls_enabled_log_empty">
 		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
 	</string>
+	<string name="loading_chat_logs">
+		Laden...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 7ca1e3721f..e0a2375067 100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -8,7 +8,9 @@
 		Compilado con [COMPILER], versión [COMPILER_VERSION]
 	</floater.string>
 	<floater.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])
+		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;
+(coordenadas globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
index f1948220b4..5cd8b3c01f 100755
--- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDITAR LOS PERMISOS DEL CONTENIDO">
+<floater name="floaterbulkperms" title="AJUSTAR LOS PERMISOS DEL CONTENIDO">
 	<floater.string name="nothing_to_modify_text">
 		Lo seleccionado tiene contenidos no editables.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Todos" label_selected="Todo" name="check_all"/>
 	<button label="Limpiar" label_selected="Ninguno" name="check_none"/>
 	<text name="newperms">
-		Permisos nuevos del contenido
+		Ajustar los permisos del contenido a
 	</text>
 	<text name="GroupLabel">
 		Grupo:
@@ -49,6 +49,7 @@
 	<check_box label="Modificarlo" name="next_owner_modify"/>
 	<check_box label="Copiarlo" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transferirlo" name="next_owner_transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Aplicar" name="apply"/>
 	<button label="Cancelar" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_goto_line.xml b/indra/newview/skins/default/xui/es/floater_goto_line.xml
new file mode 100644
index 0000000000..ef3ed80fcb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="IR A LA LÍNEA">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Ir a la línea
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 5f38fbd615..e5f48e3fd5 100755
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index 3602270e5a..e93ecc9e10 100755
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostrar:
 			</text>
-			<check_box label="Prueba" name="show_world"/>
+			<check_box label="Mundo virtual" name="show_world"/>
 			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 00bdb74881..7698348c00 100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Expulsar" name="Eject..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
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 0ba39378bb..5acd0c327a 100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Mis grupos" name="Groups..."/>
 	<menu_item_call label="Mi perfil" name="Profile..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Soltar" name="Drop"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
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 7df2d7c4e0..244099214a 100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Expulsar" name="Eject..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
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 268d6f70ab..717b46ac74 100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Mis grupos" name="Groups..."/>
 	<menu_item_call label="Mi perfil" name="Profile..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
index e4e9a0bf63..b63711589d 100644
--- a/indra/newview/skins/default/xui/es/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/es/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
 	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
 	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Cerrar seleccionados" name="close_selected_conversations"/>
 	<menu_item_call label="Ver el perfil" name="view_profile"/>
 	<menu_item_call label="MI" name="im"/>
 	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml
index b0f15be1b6..2097628356 100755
--- a/indra/newview/skins/default/xui/es/menu_land.xml
+++ b/indra/newview/skins/default/xui/es/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Comprar un pase" name="Land Buy Pass"/>
 	<menu_item_call label="Construir" name="Create"/>
 	<menu_item_call label="Modificar el terreno" name="Edit Terrain"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 289ac3f075..2286d0527a 100755
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -17,7 +17,13 @@
 		<menu_item_call label="Mostrar los &apos;TOS&apos;" name="TOS"/>
 		<menu_item_call label="Mostrar mensaje crítico" name="Critical"/>
 		<menu_item_call label="Prueba de depuración de ventanas de contenido web" name="Web Content Floater Debug Test"/>
-		<menu label="Configurar el nivel de registro" name="Set Logging Level"/>
+		<menu label="Configurar el nivel de registro" name="Set Logging Level">
+			<menu_item_check label="Depurar" name="Debug"/>
+			<menu_item_check label="Información" name="Info"/>
+			<menu_item_check label="¡Atención!" name="Warning"/>
+			<menu_item_check label="Error" name="Error"/>
+			<menu_item_check label="Ninguno" name="None"/>
+		</menu>
 		<menu_item_check label="Mostrar el selector de Grid" name="Show Grid Picker"/>
 		<menu_item_call label="Mostrar la consola de notificaciones" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_mute_particle.xml b/indra/newview/skins/default/xui/es/menu_mute_particle.xml
new file mode 100644
index 0000000000..daddf982de
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index 33ea8c88d8..e75c7283af 100755
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -5,13 +5,13 @@
 	</menu_item_call>
 	<menu_item_call label="Editar" name="Edit..."/>
 	<menu_item_call label="Construir" name="Build"/>
-	<menu_item_call label="Mostrar en linksets" name="show_in_linksets"/>
-	<menu_item_call label="Mostrar en personajes" name="show_in_characters"/>
 	<menu_item_call label="Abrir" name="Open"/>
 	<menu_item_call label="Sentarme aquí" name="Object Sit"/>
 	<menu_item_call label="Levantarme" name="Object Stand Up"/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
+	<menu_item_call label="Mostrar en linksets" name="show_in_linksets"/>
+	<menu_item_call label="Mostrar en personajes" name="show_in_characters"/>
 	<context_menu label="Ponerme" name="Put On">
 		<menu_item_call label="Ponerme" name="Wear"/>
 		<menu_item_call label="Añadir" name="Add"/>
@@ -28,4 +28,5 @@
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Comprar" name="Buy..."/>
 	<menu_item_call label="Borrar" name="Delete"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index 69a03671ab..610d65465d 100755
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Ver el perfil" name="show_agent"/>
 	<menu_item_call label="Enviar un MI..." name="send_im"/>
 	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
+	<menu_item_call label="Quitar de los amigos..." name="remove_friend"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index e78fdec558..c3c8439ea2 100755
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Perfil del objeto..." name="show_object"/>
+	<menu_item_call label="Ignorar..." name="block_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 1e0ceb2220..e4fe871683 100755
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Estado" name="Status"/>
+		<menu label="Estado" name="Status">
+			<menu_item_check label="Ausente" name="Away"/>
+			<menu_item_check label="No molestar" name="Do Not Disturb"/>
+		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -31,6 +34,7 @@
 		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
+		<menu_item_check label="Registro de conversación..." name="Conversation Log..."/>
 		<menu label="Transformación de voz" name="VoiceMorphing">
 			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
 			<menu_item_check label="Probar..." name="Preview"/>
@@ -41,6 +45,7 @@
 		<menu_item_check label="Grupos" name="My Groups"/>
 		<menu_item_check label="Gente cerca" name="Active Speakers"/>
 		<menu_item_call label="Lista de ignorados" name="Block List"/>
+		<menu_item_check label="No molestar" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_call label="Crear un hito de este sitio" name="Create Landmark Here"/>
@@ -109,6 +114,7 @@
 			<menu_item_call label="Incluir la parte siguiente" name="Include Next Part"/>
 			<menu_item_call label="Incluir la parte previa" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
 		<menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
 		<menu label="Objeto" name="Object">
@@ -272,6 +278,7 @@
 			<menu_item_check label="Camera Offset" name="Camera Offset"/>
 			<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
 			<menu_item_check label="Frame Test" name="Frame Test"/>
+			<menu_item_call label="Perfil del fotograma" name="Frame Profile"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
 			<menu_item_check label="Normales" name="Normals"/>
@@ -292,15 +299,15 @@
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
+			<menu_item_call label="Información sobre el material seleccionado" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luces y sombras" name="Advanced Lighting Model"/>
+			<menu_item_check label="Modelo de iluminación avanzado" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras del sol/la luna/proyectores" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO y sombras suavizadas" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Capas alfa automáticas (deferidas)" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="Capas alfa automáticas (no deferidas)" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Animation Textures" name="Animation Textures"/>
 			<menu_item_check label="Disable Textures" name="Disable Textures"/>
-			<menu_item_check label="Atlas de texturas (experimental)" name="Texture Atlas"/>
 			<menu_item_check label="Render Attached Lights" name="Render Attached Lights"/>
 			<menu_item_check label="Render Attached Particles" name="Render Attached Particles"/>
 			<menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/>
@@ -319,7 +326,6 @@
 			<menu_item_call label="Prueba de navegadores de medios" name="Web Browser Test"/>
 			<menu_item_call label="Navegador de contenido web" name="Web Content Browser"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
-			<menu_item_call label="Memory Stats" name="Memory Stats"/>
 			<menu_item_check label="Consola de depuración de región" name="Region Debug Console"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
 			<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 05455f54c3..d4451ad251 100755
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -206,6 +206,14 @@ No podrás removérseles de ese rol, sino que deberán renunciar a él por sí m
 ¿Añadir esta capacidad a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Estás a punto de expulsar a [AVATAR_NAME] del grupo.
+		<usetemplate ignoretext="Confirmar la expulsión de un miembro del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Estás a punto de expulsar a [COUNT] miembros del grupo.
+		<usetemplate ignoretext="Confirmar la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Vas a soltar tu anexado.
     ¿Estás seguro de que quieres continuar?
@@ -1113,7 +1121,7 @@ en TODO EL TERRENO de este sim?
 Por favor, elige un pago mayor.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Por lo menos uno  de los elementos seleccionados contiene vínculos que le señalan. Si eliminas este elemento, los vínculos dejarán de funcionar permanentemente. Lo más recomendable es eliminar primero los vínculos.
+		Por lo menos uno de los elementos contiene vínculos que lo señalan.  Si eliminas este elemento, los vínculos dejarán de funcionar permanentemente.  Lo más recomendable es eliminar primero los vínculos.
 
 ¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -1131,9 +1139,9 @@ Por favor, elige un pago mayor.
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		No eres el propietario de, al menos, uno de los ítems que has seleccionado.
+		Uno o más de los elementos seleccionados no son tuyos.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1144,25 +1152,25 @@ Al menos un objeto no es copiable.
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		Al menos un objeto está bloqueado.
-No eres propietario de, al menos, un objeto.
+		Hay un objeto bloqueado como mínimo.
+No eres propietario de al menos un objeto.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Al menos un objeto no es copiable.
-No eres propietario de, al menos, un objeto.
+		No se puede copiar un objeto como mínimo.
+No eres propietario de al menos un objeto.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		Al menos un objeto está bloqueado.
-Al menos un objeto no es copiable.
-No eres propietario de, al menos, un objeto.
+		Hay un objeto bloqueado como mínimo.
+No se puede copiar un objeto como mínimo.
+No eres propietario de al menos un objeto.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
@@ -1486,13 +1494,43 @@ Versión [VERSION] [[RELEASE_NOTES_FULL_URL]; información acerca de esta actual
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Hemos descargado una actualización de software necesaria.
-Versión [VERSION]
+Versión [VERSION] [[INFO_URL] Información sobre esta actualización]
 
-Debemos reiniciar [APP_NAME] para instalar la actualización.
+Para instalar la actualización, hay que reiniciar [APP_NAME].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
-		Debemos reiniciar [APP_NAME] para instalar la actualización.
+		Para instalar la actualización, hay que reiniciar [APP_NAME].
+[[INFO_URL] Información sobre esta actualización]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Hemos descargado una actualización aplicable a tu instalación de [APP_NAME].
+Versión [VERSION] 
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] para informarte sobre esta actualización.]
+		<usetemplate name="okcancelbuttons" notext="Más tarde..." yestext="Instalar ahora y reiniciar [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Hemos descargado una actualización aplicable a tu instalación de [APP_NAME].
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
+		<usetemplate name="okcancelbuttons" notext="Más tarde..." yestext="Instalar ahora y reiniciar [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Hemos descargado una actualización de software necesaria.
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
+
+Para instalar la actualización, hay que reiniciar [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Para instalar la actualización, hay que reiniciar [APP_NAME].
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1543,6 +1581,10 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 ¿Deseas abandonar el grupo?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		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="ConfirmKick">
 		¿Quieres realmente expulsar a todos los residentes de la cuadrícula?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/>
@@ -2404,9 +2446,7 @@ Por favor, selecciona un sólo objeto.
     elegir &apos;Teleportar&apos;.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Para ponerte en contacto con Residentes como &apos;[NAME]&apos;, pulsa el botón &quot;Gente&quot;, selecciona un Residente en la ventana que se abre y después pulsa en &apos;MI&apos; en
-    la parte inferior de la ventana.
-    (También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir &apos;MI&apos;).
+		Para abrir una conversación privada con alguien, pulsa con el botón derecho en su avatar y selecciona &apos;MI&apos; en el menú.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		No puedes seleccionar un terreno que cruce las fronteras entre servidores.
@@ -2780,6 +2820,15 @@ No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
 			<button name="Deny" text="Denegar"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un objeto propiedad de &apos;[NAME]&apos;, ha solicitado un permiso de script en tiempo de ejecución que el visor no reconoce ni puede conceder.
+
+Para obtener el permiso, descárgate aquí la última versión: [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="Aceptar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 7a7dfca0b8..06150f7619 100755
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -49,6 +49,9 @@
 				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
 				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
 			</panel>
+			<text name="groupcount">
+				Formas parte de [COUNT] grupos y puedes unirte a [REMAINING] más.
+			</text>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 28bc98f988..7feff9005c 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<panel>
+	<panel name="general_chat_settings">
 		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
 		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
 		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
@@ -8,66 +8,78 @@
 			Tamaño de la fuente:
 		</text>
 		<combo_box name="chat_font_size">
-			<item label="Pequeña" name="Small" value="0"/>
-			<item label="Mediana" name="Medium" value="1"/>
+			<item label="Pequeño" name="Small" value="0"/>
+			<item label="Medio" name="Medium" value="1"/>
 			<item label="Grande" name="Large" value="2"/>
 		</combo_box>
 		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Notificaciones
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			MI de amigos:
 		</text>
 		<combo_box name="FriendIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
 			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			MI de no amigos:
 		</text>
 		<combo_box name="NonFriendIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
 			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
-			MI de conferencia:
+			MI de conferencias:
 		</text>
 		<combo_box name="ConferenceIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
 			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			Chat de grupo:
 		</text>
 		<combo_box name="GroupChatOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
 			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
-			Chat:
+			Chat con gente cercana:
 		</text>
 		<combo_box name="NearbyChatOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			MI de objetos:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
 			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_object_im"/>
 		<text name="notifications_alert">
-			Para suspender provisionalmente todas las notificaciones, usa Comunicarme &gt; No molestar.
+			Para dejar de recibir avisos durante un tiempo, usa Comunicarme &gt; No molestar.
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Reproducir sonido:
 		</text>
@@ -76,9 +88,9 @@
 		<check_box label="Oferta de teleporte" name="teleport_offer"/>
 		<check_box label="Oferta de inventario" name="inventory_offer"/>
 	</panel>
-	<panel>
-		<button label="Limpiar el registro..." name="clear_log"/>
-		<button label="Eliminar transcripciones..." name="delete_transcripts"/>
+	<panel name="log_settings">
+		<button label="Borrar registro..." name="clear_log"/>
+		<button label="Borrar grabaciones..." name="delete_transcripts"/>
 		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
 	</panel>
 	<button label="Traducción…" name="ok_btn"/>
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 281b871fed..9362f76708 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="verdadero" label="Luces locales" name="LocalLights"/>
 		<check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
 		<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="verdadero" label="Luces y sombras" name="UseLightShaders"/>
+		<check_box initial_value="verdadero" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
 		<check_box initial_value="verdadero" label="Oclusión del ambiente" name="UseSSAO"/>
 		<check_box initial_value="verdadero" label="Profundidad del campo" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 81a29dae5a..f7eaa03d63 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Instalar automáticamente" name="Install_automatically"/>
 		<combo_box.item label="Descargar e instalar actualizaciones manualmente" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Admitir candidatos a la versión comercial a la hora de realizar actualizaciones" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Configuración de proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml
index 4c4077b96f..87314820a6 100755
--- a/indra/newview/skins/default/xui/es/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/es/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Seleccionar todo" name="Select All"/>
 			<menu_item_call label="Deseleccionar" name="Deselect"/>
 			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
+			<menu_item_call label="Ir a la línea..." name="Go to line..."/>
 		</menu>
 		<menu label="Ayuda" name="Help">
 			<menu_item_call label="Ayuda..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/es/panel_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
new file mode 100644
index 0000000000..7199905a1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Textura" name="Texture">
+	<panel.string name="string repeats per meter">
+		Repeticiones por metro
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Repeticiones por cara
+	</panel.string>
+	<text name="color label">
+		Color
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+	<text name="color trans">
+		Porcentaje de transparencia
+	</text>
+	<text name="glow label">
+		Resplandor
+	</text>
+	<check_box label="Brillo total" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Materiales" name="Materials"/>
+		<combo_box.item label="Media" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Textura (difuminar)" name="Texture (diffuse)"/>
+		<combo_box.item label="Rugosidad (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Brillo (efecto espejo)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una imagen"/>
+	<text name="label alphamode">
+		Modo alfa
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Ninguno" name="None"/>
+		<combo_box.item label="Mezclado alfa" name="Alpha blending"/>
+		<combo_box.item label="Máscara alfa" name="Alpha masking"/>
+		<combo_box.item label="Máscara de emisión lumínica" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Límite de máscara
+	</text>
+	<texture_picker label="Textura" name="bumpytexture control" tool_tip="Pulsa para elegir una imagen"/>
+	<text name="label bumpiness">
+		Rugosidad
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Ninguna" name="None"/>
+		<combo_box.item label="Claridad" name="Brightness"/>
+		<combo_box.item label="Oscuridad" name="Darkness"/>
+		<combo_box.item label="madera" name="woodgrain"/>
+		<combo_box.item label="corteza" name="bark"/>
+		<combo_box.item label="ladrillos" name="bricks"/>
+		<combo_box.item label="cuadrícula" name="checker"/>
+		<combo_box.item label="hormigón" name="concrete"/>
+		<combo_box.item label="azulejo" name="crustytile"/>
+		<combo_box.item label="piedralabrada" name="cutstone"/>
+		<combo_box.item label="discos" name="discs"/>
+		<combo_box.item label="gravilla" name="gravel"/>
+		<combo_box.item label="placadepetri" name="petridish"/>
+		<combo_box.item label="revestimiento" name="siding"/>
+		<combo_box.item label="baldosa" name="stonetile"/>
+		<combo_box.item label="estuco" name="stucco"/>
+		<combo_box.item label="succión" name="suction"/>
+		<combo_box.item label="tejido" name="weave"/>
+	</combo_box>
+	<texture_picker label="Textura" name="shinytexture control" tool_tip="Pulsa para elegir una imagen"/>
+	<text name="label shininess">
+		Brillo
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Ninguno" name="None"/>
+		<combo_box.item label="Bajo" name="Low"/>
+		<combo_box.item label="Medio" name="Medium"/>
+		<combo_box.item label="Alto" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Efecto pulido
+	</text>
+	<text name="label environment">
+		Entorno
+	</text>
+	<text name="label shinycolor">
+		Color
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+	<text name="media_info">
+		Espacio para la URL del media elegido, si procede
+	</text>
+	<button label="Elegir..." name="add_media" tool_tip="Añadir un media"/>
+	<button label="Eliminar" name="delete_media" tool_tip="Borrar esta textura para media"/>
+	<button label="Centrar" label_selected="Centrar los media" name="button align" tool_tip="Centrar esta textura para media (primero debe cargarse)"/>
+	<text name="tex gen">
+		Representación
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Por defecto" name="Default"/>
+		<combo_box.item label="En el plano" name="Planar"/>
+	</combo_box>
+	<spinner label="Escala horizontal" name="TexScaleU"/>
+	<spinner label="Escala vertical" name="TexScaleV"/>
+	<spinner label="Repeticiones por metro" name="rptctrl"/>
+	<spinner label="Grados de rotación" name="TexRot"/>
+	<spinner label="Desplazamiento horizontal" name="TexOffsetU"/>
+	<spinner label="Desplazamiento vertical" name="TexOffsetV"/>
+	<spinner label="Escala horizontal" name="bumpyScaleU"/>
+	<spinner label="Escala vertical" name="bumpyScaleV"/>
+	<spinner label="Grados de rotación" name="bumpyRot"/>
+	<spinner label="Desplazamiento horizontal" name="bumpyOffsetU"/>
+	<spinner label="Desplazamiento vertical" name="bumpyOffsetV"/>
+	<spinner label="Escala horizontal" name="shinyScaleU"/>
+	<spinner label="Escala vertical" name="shinyScaleV"/>
+	<spinner label="Grados de rotación" name="shinyRot"/>
+	<spinner label="Desplazamiento horizontal" name="shinyOffsetU"/>
+	<spinner label="Desplazamiento vertical" name="shinyOffsetV"/>
+	<check_box initial_value="falso" label="Alinear caras del plano" name="checkbox planar align" tool_tip="Alinear texturas en todas las caras seleccionadas con la última cara seleccionada. Requiere la representación de texturas en el plano."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index 660293b02c..902ed4df52 100755
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, así como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte." name="Parcel Identity">
 		<action description="Cambiar &apos;Mostrar el sitio en Buscar&apos; y configurar la categoría" longdescription="Cambia &apos;Mostrar el sitio en Buscar&apos; y el configurar la categoría de una parcela en Acerca del terreno &gt; pestaña Opciones." name="land find places" value="17"/>
-		<action description="Cambiar el nombre de la parcela, su descripción, y la configuración de &apos;Mostrar el sitio en Buscar&apos;" longdescription="Cambia el nombre de la parcela, su descripción, y la configuración de &apos;Mostrar el sitio en Buscar&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land change identity" value="18"/>
+		<action description="Cambia el nombre de la parcela, su descripción y la configuración de &apos;Contenido moderado&apos;." longdescription="Cambia el nombre de la parcela, su descripción y la configuración de &apos;Contenido moderado&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land change identity" value="18"/>
 		<action description="Definir los puntos de llegada y teleporte" longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 937433e210..4686d1ed3a 100755
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -130,6 +130,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download.
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
 http://secondlife.com/download.
@@ -439,6 +442,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="SLappAgentRequestFriend">
 		Petición de amistad
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Eliminación de amigos
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Cerrar (⌘W)
 	</string>
@@ -823,6 +829,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="anim_yes_head">
 		Sí
 	</string>
+	<string name="use_texture">
+		Usar textura
+	</string>
 	<string name="texture_loading">
 		Cargando...
 	</string>
@@ -919,6 +928,21 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="TeleportYourAgent">
 		Teleportarte
 	</string>
+	<string name="JoinAnExperience">
+		Únete a una experiencia
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Suprimir alertas al gestionar las listas de acceso a un estado
+	</string>
+	<string name="OverrideYourAnimations">
+		Reemplazar tus animaciones predeterminadas
+	</string>
+	<string name="ScriptReturnObjects">
+		Devolver objetos en tu nombre
+	</string>
+	<string name="UnknownScriptPermission">
+		(desconocido)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1944,6 +1968,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD: abajo der.
 	</string>
+	<string name="ATTACH_NECK">
+		Cuello
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centro del avatar
+	</string>
 	<string name="CursorPos">
 		Línea [LINE], Columna [COLUMN]
 	</string>
@@ -2931,6 +2961,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Hip Width">
 		Cadera: ancho
 	</string>
+	<string name="Hover">
+		Pasa el cursor
+	</string>
 	<string name="In">
 		Pegadas
 	</string>
@@ -4991,4 +5024,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="logging_calls_enabled_log_empty">
 		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
 	</string>
+	<string name="loading_chat_logs">
+		Cargando...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index d45bdccf3e..384966354e 100755
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -9,6 +9,8 @@
 	</floater.string>
 	<floater.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;
+(coordonnées globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
index ab68ce166b..7ee4441758 100755
--- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFIER LES DROITS">
+<floater name="floaterbulkperms" title="MODIFIER LES DROITS RELATIFS AU CONTENU">
 	<floater.string name="nothing_to_modify_text">
 		Certains contenus sont non modifiables.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Tout" label_selected="Tout" name="check_all"/>
 	<button label="Effacer" label_selected="Aucun" name="check_none"/>
 	<text name="newperms">
-		Nouveaux droits
+		Modifier les droits relatifs au contenu et remplacer par
 	</text>
 	<text name="GroupLabel">
 		Groupe :
@@ -49,6 +49,7 @@
 	<check_box label="Modifier" name="next_owner_modify"/>
 	<check_box label="Copier" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transférer" name="next_owner_transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Appliquer" name="apply"/>
 	<button label="Annuler" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_goto_line.xml b/indra/newview/skins/default/xui/fr/floater_goto_line.xml
new file mode 100644
index 0000000000..fdc800b40b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ALLER À LA LIGNE">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Aller à la ligne
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 8ab98b8e4e..6d98f0a846 100755
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 0bcf55aba5..02d969dc08 100755
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Afficher :
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Monde" name="show_world"/>
 			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
 			<check_box label="Maillage de navigation" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 f48513eb2b..0450be28e0 100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Figer" name="Freeze..."/>
 	<menu_item_call label="Expulser" name="Eject..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<menu_item_call label="Payer" name="Pay..."/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
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 6af2064e44..f2e7928c24 100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Mes groupes" name="Groups..."/>
 	<menu_item_call label="Mon profil" name="Profile..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Lâcher" name="Drop"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
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 08d1a20361..1f5c1724f8 100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Figer" name="Freeze..."/>
 	<menu_item_call label="Expulser" name="Eject..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<menu_item_call label="Payer" name="Pay..."/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
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 6310a2177a..4815ad0676 100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Mes groupes" name="Groups..."/>
 	<menu_item_call label="Mon profil" name="Profile..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
index 857ead603b..09109f4555 100644
--- a/indra/newview/skins/default/xui/fr/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
 	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
 	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
+	<menu_item_call label="Fermer la sélection" name="close_selected_conversations"/>
 	<menu_item_call label="Voir le profil" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml
index b84daee3ae..7beaf00c58 100755
--- a/indra/newview/skins/default/xui/fr/menu_land.xml
+++ b/indra/newview/skins/default/xui/fr/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Acheter un pass" name="Land Buy Pass"/>
 	<menu_item_call label="Construire" name="Create"/>
 	<menu_item_call label="Modifier le terrain" name="Edit Terrain"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index dc6b2793ca..7b1e106474 100755
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Afficher les conditions d&apos;utilisation" name="TOS"/>
 		<menu_item_call label="Afficher le message critique" name="Critical"/>
 		<menu_item_call label="Test de débogage de la fenêtre flottante du contenu Web" name="Web Content Floater Debug Test"/>
-		<menu label="Définir le niveau de connexion" name="Set Logging Level"/>
+		<menu label="Définir le niveau de connexion" name="Set Logging Level">
+			<menu_item_check label="Débogage" name="Debug"/>
+			<menu_item_check label="Infos" name="Info"/>
+			<menu_item_check label="Avertissement" name="Warning"/>
+			<menu_item_check label="Erreur" name="Error"/>
+			<menu_item_check label="Aucun" name="None"/>
+		</menu>
 		<menu_item_check label="Afficher le sélecteur de grille" name="Show Grid Picker"/>
 		<menu_item_call label="Afficher la console des notifications" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_mute_particle.xml b/indra/newview/skins/default/xui/fr/menu_mute_particle.xml
new file mode 100644
index 0000000000..5f5e4c8b08
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 573b6da582..d7b69e495a 100755
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -5,13 +5,13 @@
 	</menu_item_call>
 	<menu_item_call label="Modifier" name="Edit..."/>
 	<menu_item_call label="Construire" name="Build"/>
-	<menu_item_call label="Voir parmi les groupes de liens" name="show_in_linksets"/>
-	<menu_item_call label="Voir parmi les personnages" name="show_in_characters"/>
 	<menu_item_call label="Ouvrir" name="Open"/>
 	<menu_item_call label="M&apos;asseoir ici" name="Object Sit"/>
 	<menu_item_call label="Me lever" name="Object Stand Up"/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
+	<menu_item_call label="Voir parmi les groupes de liens" name="show_in_linksets"/>
+	<menu_item_call label="Voir parmi les personnages" name="show_in_characters"/>
 	<context_menu label="Porter" name="Put On">
 		<menu_item_call label="Porter" name="Wear"/>
 		<menu_item_call label="Ajouter" name="Add"/>
@@ -28,4 +28,5 @@
 	<menu_item_call label="Payer" name="Pay..."/>
 	<menu_item_call label="Acheter" name="Buy..."/>
 	<menu_item_call label="Supprimer" name="Delete"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index d701b3a414..2c7443c6ca 100755
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Voir le profil" name="show_agent"/>
 	<menu_item_call label="Envoyer IM..." name="send_im"/>
 	<menu_item_call label="Devenir amis..." name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami..." name="remove_friend"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index 0a934d3e69..5d745ef5f8 100755
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
+	<menu_item_call label="Ignorer…" name="block_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 548f144742..5d0026ace0 100755
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Statut" name="Status"/>
+		<menu label="Statut" name="Status">
+			<menu_item_check label="Absent" name="Away"/>
+			<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="Page d&apos;accueil du compte..." name="Manage My Account">
@@ -32,6 +35,7 @@
 		<menu_item_check label="Conversations..." name="Conversations"/>
 		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
+		<menu_item_check label="Journal des conversations..." name="Conversation Log..."/>
 		<menu label="Effet de voix" name="VoiceMorphing">
 			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
 			<menu_item_check label="Aperçu..." name="Preview"/>
@@ -42,6 +46,7 @@
 		<menu_item_check label="Groupes" name="My Groups"/>
 		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
 		<menu_item_call label="Liste des ignorés" name="Block List"/>
+		<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Monde" name="World">
 		<menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
 			<menu_item_call label="Inclure la partie suivante" name="Include Next Part"/>
 			<menu_item_call label="Inclure la partie précédente" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Groupes de liens..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Point central sur la sélection" name="Focus on Selection"/>
 		<menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/>
 		<menu label="Objet" name="Object">
@@ -279,6 +285,7 @@
 			<menu_item_check label="Taux de défilement aléatoire" name="Randomize Framerate"/>
 			<menu_item_check label="Cadre lent périodique" name="Periodic Slow Frame"/>
 			<menu_item_check label="Test cadre" name="Frame Test"/>
+			<menu_item_call label="Profil du cadre" name="Frame Profile"/>
 		</menu>
 		<menu label="Métadonnées de rendu" name="Render Metadata">
 			<menu_item_check label="Cadres" name="Bounding Boxes"/>
@@ -313,9 +320,10 @@
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Tangente" name="Tangent Basis"/>
 			<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Infos sur les matériaux sélectionnés" name="Selected Material Info"/>
 			<menu_item_check label="Filaire" name="Wireframe"/>
 			<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
-			<menu_item_check label="Éclairage et ombres" name="Advanced Lighting Model"/>
+			<menu_item_check label="Modèle d&apos;éclairage avancé" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Débogage GL" name="Debug GL"/>
@@ -325,7 +333,6 @@
 			<menu_item_check label="Textures d&apos;animation" name="Animation Textures"/>
 			<menu_item_check label="Désactiver les textures" name="Disable Textures"/>
 			<menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/>
-			<menu_item_check label="Atlas des textures (expérimental)" name="Texture Atlas"/>
 			<menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/>
 			<menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/>
 			<menu_item_check label="Objets en surbrillance avec le pointeur" name="Hover Glow Objects"/>
@@ -361,7 +368,6 @@
 			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
 			<menu_item_call label="Imprimer les infos sur l&apos;objet sélectionné" name="Print Selected Object Info"/>
 			<menu_item_call label="Imprimer les infos sur l&apos;avatar" name="Print Agent Info"/>
-			<menu_item_call label="Statistiques de mémoire" name="Memory Stats"/>
 			<menu_item_check label="Console de débogage de région" name="Region Debug Console"/>
 			<menu_item_check label="Débogage SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Débogage clics" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index e73cc6e6e0..c295a6f5a7 100755
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -209,6 +209,14 @@ Ajouter ce pouvoir à « [ROLE_NAME] » ?
 Ajouter ce pouvoir à « [ROLE_NAME] » ?
 		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Vous allez expulser [AVATAR_NAME] du groupe.
+		<usetemplate ignoretext="Confirmer l&apos;expulsion d&apos;un membre du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Vous allez expulser [COUNT] membres du groupe.
+		<usetemplate ignoretext="Confirmer l&apos;expulsion de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Vous êtes sur le point d&apos;abandonner l&apos;élément joint.
 Voulez-vous vraiment continuer ?
@@ -1106,7 +1114,7 @@ Voir https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 Veuillez saisir un montant plus élevé.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Des articles liés pointent vers au moins un article sélectionné. Les liens arrêteront définitivement de fonctionner si vous supprimez cet article. Il est vivement conseillé de supprimer d&apos;abord ces liens.
+		Des liens pointent vers au moins un article sélectionné.  Les liens arrêteront définitivement de fonctionner si vous supprimez cet article.  Il est vivement conseillé de supprimer d&apos;abord ces liens.
 
 Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -1126,7 +1134,7 @@ Voulez-vous vraiment supprimer ces articles ?
 	<notification name="ConfirmObjectDeleteNoOwn">
 		Au moins un des objets que vous avez sélectionnés ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1140,23 +1148,23 @@ Au moins un des objets n&apos;est pas copiable.
 		Au moins un des objets est verrouillé.
 Au moins un des objets ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Au moins un des objets n&apos;est pas copiable.
+		Au moins un des objets n&apos;est pas reproductible.
 Au moins un des objets ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
 		Au moins un des objets est verrouillé.
-Au moins un des objets n&apos;est pas copiable.
+Au moins un des objets n&apos;est pas reproductible.
 Au moins un des objets ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="annuler" yestext="OK"/>
+Voulez-vous vraiment supprimer ces articles ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Au moins un des objets est verrouillé.
@@ -1477,13 +1485,43 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Informations relatives à cette mise
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Nous avons téléchargé une mise à jour logicielle requise.
-Version [VERSION]
+Version [VERSION] [Informations au sujet de cette mise à jour [INFO_URL]]
 
 [APP_NAME] doit être redémarré pour que la mise à jour soit installée.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+[Informations au sujet de cette mise à jour [INFO_URL]]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Nous avons téléchargé une mise à jour de votre installation [APP_NAME].
+Version [VERSION] 
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [[INFO_URL] pour en savoir plus sur cette mise à jour]
+		<usetemplate name="okcancelbuttons" notext="Ultérieurement..." yestext="Installer maintenant et redémarrer [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Nous avons téléchargé une mise à jour de votre installation [APP_NAME].
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
+		<usetemplate name="okcancelbuttons" notext="Ultérieurement..." yestext="Installer maintenant et redémarrer [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Nous avons téléchargé une mise à jour logicielle requise.
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
+
+[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1534,6 +1572,10 @@ Version [VERSION]
 Quitter le groupe ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		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="ConfirmKick">
 		Souhaitez-vous vraiment éjecter tous les résidents de la grille ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous les résidents"/>
@@ -2396,9 +2438,7 @@ Veuillez sélectionner un seul objet.
     choisir Téléportation).
 	</notification>
 	<notification name="TeleportToPerson">
-		Pour contacter un résident tel que [NAME], cliquez sur le bouton Personnes, sélectionnez le résident dans la fenêtre qui s&apos;ouvre, puis cliquez sur IM en
-    bas de la fenêtre.
-    (Vous pouvez aussi double-cliquer sur le nom du résident dans la liste ou cliquer-droit dessus et choisir IM.)
+		Pour ouvrir une conversation privée avec une autre personne, cliquez-droit sur son avatar et choisissez IM dans le menu.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Vous ne pouvez pas sélectionner de terrain en dehors des limites du serveur.
@@ -2772,6 +2812,15 @@ N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l
 			<button name="Deny" text="Refuser"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		Le client ne reconnaît pas le droit de script à l&apos;exécution demandé par &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, objet appartenant à [NAME], et ne peut donc pas l&apos;accorder.
+
+Pour accorder ce droit, mettez votre client à jour pour passer à la version la plus récente, à partir de [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="OK"/>
+			<button name="Mute" text="Ignorer"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		&lt;nolink&gt;[TITLE]&lt;/nolink&gt; de [NAME]
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 227ce26df7..e306a00183 100755
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -49,6 +49,9 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
 				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
 			</panel>
+			<text name="groupcount">
+				Vous appartenez à [COUNT] groupes, et pouvez en rejoindre [REMAINING] autres.
+			</text>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 972190dc15..52c6ed24b9 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<panel>
+	<panel name="general_chat_settings">
 		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
 		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
 		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
@@ -14,60 +14,72 @@
 		</combo_box>
 		<check_box label="Bulles de chat" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Notifications
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			IM amis :
 		</text>
 		<combo_box name="FriendIMOptions">
 			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			IM non amis :
 		</text>
 		<combo_box name="NonFriendIMOptions">
 			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			IM conférence :
 		</text>
 		<combo_box name="ConferenceIMOptions">
 			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			Chat de groupe :
 		</text>
 		<combo_box name="GroupChatOptions">
 			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			Chat près de moi :
 		</text>
 		<combo_box name="NearbyChatOptions">
 			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IM objet :
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Écouter le son :
 		</text>
@@ -76,7 +88,7 @@
 		<check_box label="Offre de téléportation" name="teleport_offer"/>
 		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
 	</panel>
-	<panel>
+	<panel name="log_settings">
 		<button label="Effacer le journal..." name="clear_log"/>
 		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
 		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
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 a738b2d43f..4946b09814 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
 		<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
 		<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Éclairage et ombres" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Modèle d&apos;éclairage avancé" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
 		<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 83303950dc..50f4a49bd0 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Installation automatique" name="Install_automatically"/>
 		<combo_box.item label="Téléchargement et installation manuels" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Accepte de passer aux versions avant sortie officielle" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Paramètres de proxy :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
index 29fbe3c7e7..38e5cbe1f1 100755
--- a/indra/newview/skins/default/xui/fr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Tout sélectionner" name="Select All"/>
 			<menu_item_call label="Désélectionner" name="Deselect"/>
 			<menu_item_call label="Rechercher / Remplacer..." name="Search / Replace..."/>
+			<menu_item_call label="Aller à la ligne..." name="Go to line..."/>
 		</menu>
 		<menu label="Aide" name="Help">
 			<menu_item_call label="Aide..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
new file mode 100644
index 0000000000..c69cb61a92
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Texture" name="Texture">
+	<panel.string name="string repeats per meter">
+		Répétitions au mètre
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Répétitions par face
+	</panel.string>
+	<text name="color label">
+		Couleur
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	<text name="color trans">
+		% de transparence
+	</text>
+	<text name="glow label">
+		Rayonnement
+	</text>
+	<check_box label="Lumineux" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Matériaux" name="Materials"/>
+		<combo_box.item label="Médias" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Texture (diffuse)" name="Texture (diffuse)"/>
+		<combo_box.item label="Relief (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Brillance (spéculaire)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
+	<text name="label alphamode">
+		Mode alpha
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Aucun" name="None"/>
+		<combo_box.item label="Fusion alpha" name="Alpha blending"/>
+		<combo_box.item label="Masquage alpha" name="Alpha masking"/>
+		<combo_box.item label="Masque émissif" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Coupe du masque
+	</text>
+	<texture_picker label="Texture" name="bumpytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+	<text name="label bumpiness">
+		Relief
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Aucun" name="None"/>
+		<combo_box.item label="Luminosité" name="Brightness"/>
+		<combo_box.item label="Obscurité" name="Darkness"/>
+		<combo_box.item label="aggloméré" name="woodgrain"/>
+		<combo_box.item label="écorce" name="bark"/>
+		<combo_box.item label="briques" name="bricks"/>
+		<combo_box.item label="damier" name="checker"/>
+		<combo_box.item label="béton" name="concrete"/>
+		<combo_box.item label="carrelage" name="crustytile"/>
+		<combo_box.item label="pierre de taille" name="cutstone"/>
+		<combo_box.item label="disques" name="discs"/>
+		<combo_box.item label="gravier" name="gravel"/>
+		<combo_box.item label="boîte de Petri" name="petridish"/>
+		<combo_box.item label="lattes" name="siding"/>
+		<combo_box.item label="carreaux" name="stonetile"/>
+		<combo_box.item label="stuc" name="stucco"/>
+		<combo_box.item label="ventouses" name="suction"/>
+		<combo_box.item label="tissage" name="weave"/>
+	</combo_box>
+	<texture_picker label="Texture" name="shinytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+	<text name="label shininess">
+		Brillance
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Aucune" name="None"/>
+		<combo_box.item label="Faible" name="Low"/>
+		<combo_box.item label="Moyenne" name="Medium"/>
+		<combo_box.item label="Élevée" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Lustrage
+	</text>
+	<text name="label environment">
+		Environnement
+	</text>
+	<text name="label shinycolor">
+		Couleur
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	<text name="media_info">
+		L&apos;URL du média choisi, le cas échéant, se place ici.
+	</text>
+	<button label="Choisir..." name="add_media" tool_tip="Ajouter un média"/>
+	<button label="Supprimer" name="delete_media" tool_tip="Supprimer cette texture de média"/>
+	<button label="Aligner" label_selected="Aligner le média" name="button align" tool_tip="Ajuster la texture du média (le chargement doit d’abord se terminer)"/>
+	<text name="tex gen">
+		Application
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Valeur par défaut" name="Default"/>
+		<combo_box.item label="Plan" name="Planar"/>
+	</combo_box>
+	<spinner label="Échelle horizontale" name="TexScaleU"/>
+	<spinner label="Échelle verticale" name="TexScaleV"/>
+	<spinner label="Répétitions au mètre" name="rptctrl"/>
+	<spinner label="Degrés de rotation" name="TexRot"/>
+	<spinner label="Décalage horizontal" name="TexOffsetU"/>
+	<spinner label="Décalage vertical" name="TexOffsetV"/>
+	<spinner label="Échelle horizontale" name="bumpyScaleU"/>
+	<spinner label="Échelle verticale" name="bumpyScaleV"/>
+	<spinner label="Degrés de rotation" name="bumpyRot"/>
+	<spinner label="Décalage horizontal" name="bumpyOffsetU"/>
+	<spinner label="Décalage vertical" name="bumpyOffsetV"/>
+	<spinner label="Échelle horizontale" name="shinyScaleU"/>
+	<spinner label="Échelle verticale" name="shinyScaleV"/>
+	<spinner label="Degrés de rotation" name="shinyRot"/>
+	<spinner label="Décalage horizontal" name="shinyOffsetU"/>
+	<spinner label="Décalage vertical" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 7187de8760..2a68ca0ddb 100755
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation." name="Parcel Identity">
 		<action description="Activer Afficher le lieu dans la recherche et définir la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d&apos;une parcelle dans l&apos;onglet À propos du terrain &gt; Options." name="land find places" value="17"/>
-		<action description="Modifier le nom et la description de la parcelle, ainsi que les paramètres d&apos;affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d&apos;affichage du lieu dans la recherche. Pour ce faire, utilisez l&apos;onglet À propos du terrain &gt; Options." name="land change identity" value="18"/>
+		<action description="Changer le nom de la parcelle, la description et les paramètres de contenu modéré" longdescription="Changez le nom de la parcelle, la description et les paramètres de contenu modéré. Pour ce faire, utilisez l&apos;onglet À propos du terrain &gt; Options." name="land change identity" value="18"/>
 		<action description="Définir le lieu d&apos;arrivée et le routage des téléportations" longdescription="Définissez le lieu d&apos;arrivée des téléportations et le routage à partir du menu À propos du terrain &gt; Options." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d&apos;objets et le relief." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 69ed20f376..346fa62351 100755
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -139,6 +139,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
 http://secondlife.com/download
@@ -448,6 +451,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="SLappAgentRequestFriend">
 		Demande d&apos;amitié
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Suppression d&apos;un ami
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Fermer (⌘W)
 	</string>
@@ -838,6 +844,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="multiple_textures">
 		Multiples
 	</string>
+	<string name="use_texture">
+		Utiliser la texture
+	</string>
 	<string name="texture_loading">
 		Chargement...
 	</string>
@@ -937,6 +946,21 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="TeleportYourAgent">
 		Vous téléporter
 	</string>
+	<string name="JoinAnExperience">
+		Rejoindre une expérience
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Supprimer les alertes lors de la gestion des listes d&apos;accès aux domaines
+	</string>
+	<string name="OverrideYourAnimations">
+		Remplacer vos animations par défaut
+	</string>
+	<string name="ScriptReturnObjects">
+		Renvoyer les objets de votre part
+	</string>
+	<string name="UnknownScriptPermission">
+		(inconnu)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1968,6 +1992,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD en bas à droite
 	</string>
+	<string name="ATTACH_NECK">
+		Cou
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centre de l&apos;avatar
+	</string>
 	<string name="CursorPos">
 		Ligne [LINE], colonne [COLUMN]
 	</string>
@@ -2997,6 +3027,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Hip Width">
 		Largeur hanche
 	</string>
+	<string name="Hover">
+		Survol
+	</string>
 	<string name="In">
 		Rentré
 	</string>
@@ -5081,4 +5114,7 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="logging_calls_enabled_log_empty">
 		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
 	</string>
+	<string name="loading_chat_logs">
+		Chargement...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index b0fb585fa2..6f09eca90c 100755
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -8,7 +8,9 @@
 		Generato con [COMPILER] versione [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Tu sei  [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])
+		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;
+(coordinate globali [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
index 89f4a0cb71..399eb15802 100755
--- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFICA PERMESSI DEL CONTENUTO">
+<floater name="floaterbulkperms" title="CAMBIA I PERMESSI DEL CONTENUTO">
 	<floater.string name="nothing_to_modify_text">
 		La selezione non contiene nessun contenuto modificabile.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Tutti" label_selected="Tutti" name="check_all"/>
 	<button label="Cancella" label_selected="Nessuno" name="check_none"/>
 	<text name="newperms">
-		Nuovi permessi del contenuto
+		Cambia i permessi del contenuto a
 	</text>
 	<text name="GroupLabel">
 		Gruppo:
@@ -49,6 +49,7 @@
 	<check_box label="Modificare" name="next_owner_modify"/>
 	<check_box label="Copiare" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Trasferisci" name="next_owner_transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Applica" name="apply"/>
 	<button label="Annulla" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_goto_line.xml b/indra/newview/skins/default/xui/it/floater_goto_line.xml
new file mode 100644
index 0000000000..29a4aabb99
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="PASSA ALLA RIGA">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Passa alla riga
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index d38ec7a5fe..71f90accde 100755
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduci chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traduci chat" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 7777444161..77be220a2a 100755
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostra:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Mondo" name="show_world"/>
 			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 d4d6fd68d0..d4ce25e6a5 100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Congela" name="Freeze..."/>
 	<menu_item_call label="Espelli" name="Eject..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Profilo dell&apos;oggetto" name="Object Inspect"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
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 0b841d591f..b28137262f 100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Lascia" name="Drop"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
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 c2edc32a49..a2b864b3e1 100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Congela" name="Freeze..."/>
 	<menu_item_call label="Espelli" name="Eject..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
 	<menu_item_call label="Paga" name="Pay..."/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
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 a4dafd7b5f..3666571065 100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
index 46ced93f1d..24486f2af2 100644
--- a/indra/newview/skins/default/xui/it/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/it/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
 	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
 	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
+	<menu_item_call label="Chiudi selezionato" name="close_selected_conversations"/>
 	<menu_item_call label="Vedi profilo" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="Offri teleport" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/it/menu_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml
index f510078e14..816849a7b5 100755
--- a/indra/newview/skins/default/xui/it/menu_land.xml
+++ b/indra/newview/skins/default/xui/it/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Acquista Permesso" name="Land Buy Pass"/>
 	<menu_item_call label="Costruisci" name="Create"/>
 	<menu_item_call label="Modifica terreno" name="Edit Terrain"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 7b060e6565..35053ec499 100755
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -17,7 +17,13 @@
 		<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
 		<menu_item_call label="Mostra messaggio critico" name="Critical"/>
 		<menu_item_call label="Test debug finestra contenuti Web" name="Web Content Floater Debug Test"/>
-		<menu label="Imposta livello di registrazione" name="Set Logging Level"/>
+		<menu label="Imposta livello di registrazione" name="Set Logging Level">
+			<menu_item_check label="Debug" name="Debug"/>
+			<menu_item_check label="Info" name="Info"/>
+			<menu_item_check label="Attenzione" name="Warning"/>
+			<menu_item_check label="Errore" name="Error"/>
+			<menu_item_check label="Nessuno" name="None"/>
+		</menu>
 		<menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/>
 		<menu_item_call label="Mostra Console notifiche" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_mute_particle.xml b/indra/newview/skins/default/xui/it/menu_mute_particle.xml
new file mode 100644
index 0000000000..7eb4b09495
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index 7f41e8937f..9bcc0879d2 100755
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -5,13 +5,13 @@
 	</menu_item_call>
 	<menu_item_call label="Modifica" name="Edit..."/>
 	<menu_item_call label="Costruisci" name="Build"/>
-	<menu_item_call label="Mostra nei set collegati" name="show_in_linksets"/>
-	<menu_item_call label="Mostra nei personaggi" name="show_in_characters"/>
 	<menu_item_call label="Apri" name="Open"/>
 	<menu_item_call label="Siediti qui" name="Object Sit"/>
 	<menu_item_call label="Alzati" name="Object Stand Up"/>
 	<menu_item_call label="Profilo dell&apos;oggetto" name="Object Inspect"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
+	<menu_item_call label="Mostra nei set collegati" name="show_in_linksets"/>
+	<menu_item_call label="Mostra nei personaggi" name="show_in_characters"/>
 	<context_menu label="Metti" name="Put On">
 		<menu_item_call label="Indossa" name="Wear"/>
 		<menu_item_call label="Aggiungi" name="Add"/>
@@ -28,4 +28,5 @@
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Acquista" name="Buy..."/>
 	<menu_item_call label="Elimina" name="Delete"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index abfbab35a3..e5c20fb9e9 100755
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Vedi profilo" name="show_agent"/>
 	<menu_item_call label="Manda IM..." name="send_im"/>
 	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
+	<menu_item_call label="Togli amicizia..." name="remove_friend"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 8456d14b63..116b652172 100755
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Profilo oggetto..." name="show_object"/>
+	<menu_item_call label="Blocca..." name="block_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 2b7bc71df7..52247d6c9c 100755
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Stato" name="Status"/>
+		<menu label="Stato" name="Status">
+			<menu_item_check label="Assente" name="Away"/>
+			<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="Dashboard dell&apos;account..." name="Manage My Account">
@@ -32,6 +35,7 @@
 		<menu_item_check label="Conversazioni..." name="Conversations"/>
 		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
+		<menu_item_check label="Registro conversazioni..." name="Conversation Log..."/>
 		<menu label="Manipolazione voce" name="VoiceMorphing">
 			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
 			<menu_item_check label="Anteprima..." name="Preview"/>
@@ -42,6 +46,7 @@
 		<menu_item_check label="Gruppi" name="My Groups"/>
 		<menu_item_check label="Persone vicine" name="Active Speakers"/>
 		<menu_item_call label="Blocca lista" name="Block List"/>
+		<menu_item_check label="Non disturbare" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Mondo" name="World">
 		<menu_item_call label="Crea punto di riferimento per questo luogo" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
 			<menu_item_call label="Includi parte successiva" name="Include Next Part"/>
 			<menu_item_call label="Includi parte precedente" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Set collegati..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
 		<menu_item_call label="Zoom sulla selezione" name="Zoom to Selection"/>
 		<menu label="Oggetto" name="Object">
@@ -273,6 +279,7 @@
 			<menu_item_check label="Spostamento fotocamera" name="Camera Offset"/>
 			<menu_item_check label="Veloc. di visualizzazione casuale" name="Randomize Framerate"/>
 			<menu_item_check label="Test frame" name="Frame Test"/>
+			<menu_item_call label="Profilo frame" name="Frame Profile"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
 			<menu_item_check label="Normali" name="Normals"/>
@@ -293,15 +300,15 @@
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
+			<menu_item_call label="Info materiale selezionato" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luci e ombre" name="Advanced Lighting Model"/>
+			<menu_item_check label="Modello illuminazione avanzato" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombra dal sole, dalla luna e dai proiettori" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e ombre fluide" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Maschera alfa automatica (differita)" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="Maschera alfa automatica (non differita)" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Texture delle animazioni" name="Animation Textures"/>
 			<menu_item_check label="Disabilita texture" name="Disable Textures"/>
-			<menu_item_check label="Atlante tessitura (sperimentale)" name="Texture Atlas"/>
 			<menu_item_check label="Rendering delle luci unite" name="Render Attached Lights"/>
 			<menu_item_check label="Rendering particelle unite" name="Render Attached Particles"/>
 			<menu_item_check label="Gli oggetti brillano quando sono sotto il cursore" name="Hover Glow Objects"/>
@@ -320,7 +327,6 @@
 			<menu_item_call label="Test browser multimedia" name="Web Browser Test"/>
 			<menu_item_call label="Browser contenuto Web" name="Web Content Browser"/>
 			<menu_item_call label="Stampa informazioni oggetto selezionato" name="Print Selected Object Info"/>
-			<menu_item_call label="Statistiche memoria" name="Memory Stats"/>
 			<menu_item_check label="Console di debug regione" name="Region Debug Console"/>
 			<menu_item_check label="Debug clic" name="Debug Clicks"/>
 			<menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 8adbebb62a..96b8c96595 100755
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -210,6 +210,14 @@ Aggiungi questo potere a &apos;[ROLE_NAME]&apos;?
 Aggiungi questo potere a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Stai per espellere [AVATAR_NAME] dal gruppo.
+		<usetemplate ignoretext="Conferma l&apos;espulsione di un partecipante dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Stai per espellere [COUNT] membri dal gruppo.
+		<usetemplate ignoretext="Conferma l&apos;espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Stai per abbandonare il tuo accessorio.
     Vuoi continuare?
@@ -1110,7 +1118,7 @@ su TUTTI I TERRENI di questa sim?
 Introduci un prezzo più alto.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Almeno uno degli oggetti selezionati è collegato tramite link ad altri oggetti.  Se elimini l&apos;oggetto, i relativi link non funzioneranno più.  Pertanto si consiglia vivamente di eliminare prima i link.
+		Almeno uno degli oggetti è collegato tramite link ad altri oggetti.  Se elimini l&apos;oggetto, i relativi link non funzioneranno più.  Si consiglia vivamente di eliminare prima i link.
 
 Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1128,9 +1136,9 @@ Confermi di voler cancellare questi elementi?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		Non possiedi neanche uno degli oggetti selezionati.
+		Non possiedi almeno uno degli oggetti selezionati.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1142,24 +1150,24 @@ Confermi di voler cancellare questi elementi?
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
 		Almeno un oggetto è bloccato.
-Non possiedi neanche un oggetto.
+Non possiedi almeno uno degli oggetti.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Cancella" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Almeno un oggetto non è copiabile.
-Non possiedi neanche un oggetto.
+		Almeno un oggetto non può essere copiato.
+Non possiedi almeno uno degli oggetti.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
 		Almeno un oggetto è bloccato.
-Almeno un oggetto è non copiabile.
-Non possiedi neanche un oggetto.
+Almeno un oggetto non può essere copiato.
+Non possiedi almeno uno degli oggetti.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
@@ -1481,13 +1489,43 @@ Versione [VERSION] [[RELEASE_NOTES_FULL_URL] Informazioni su questo aggiornament
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		È stato scaricato un aggiornamento obbligatorio del software.
-Versione [VERSION]
+Versione [VERSION] [[INFO_URL] Informazioni su questo aggiornamento]
 
 Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+[[INFO_URL] Informazioni su questo aggiornamento]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		È stato scaricato un aggiornamento dell&apos;installazione di [APP_NAME].
+Versione [VERSION] 
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] per informazioni su queesto aggiornamento]
+		<usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		È stato scaricato un aggiornamento dell&apos;installazione di [APP_NAME].
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
+		<usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		È stato scaricato un aggiornamento obbligatorio del software.
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
+
+Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1538,6 +1576,10 @@ Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
 Lasciare il gruppo?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		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="ConfirmKick">
 		Vuoi veramente espellere tutti i residenti dalla griglia?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli tutti i residenti"/>
@@ -2401,9 +2443,7 @@ Seleziona solo un oggetto.
     scegliere Teleport.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Per contattare Residenti come &apos;[NAME]&apos;, clicca sul pulsante &quot;Persone&quot;, seleziona un Residente nel pannello che viene aperto, quindi clicca su &apos;IM&apos; in
-    basso nel pannello.
-    (Puoi anche fare doppio clic sul nome nell&apos;elenco oppure fare clic con il pulsante destro del mouse e selezionare &apos;IM&apos;).
+		Per avviare una conversazione privata con un&apos;altra persona, fai clic con il tasto destro sull&apos;avatar e seleziona &apos;IM&apos; dal menu.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Non è possibile selezionare il terreno attraverso i confini del server.
@@ -2777,6 +2817,15 @@ Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui d
 			<button name="Deny" text="Nega"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		L&apos;autorizzazione per script runtime richiesta da &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un oggetto di proprietà di &apos;[NAME]&apos;, non è stata riconosciuta nel viewer e non può essere concessa.
+
+Per concedere questa autorizzazione è necessario che il viewer venga aggiornato alla versione più recente da [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="Ok"/>
+			<button name="Mute" text="Blocca"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; di [NAME]
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index e1468db76e..2f40d4bdc4 100755
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -49,6 +49,9 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
 				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
 			</panel>
+			<text name="groupcount">
+				Fai parte di [COUNT] gruppi e puoi iscriverti a [REMAINING] altri.
+			</text>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index c2ac6e97a9..09d7c96370 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Simula la battitura tasti quando sei in chat" name="play_typing_animation"/>
 		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
 		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
 		<text name="font_size">
-			Dimensioni caratteri:
+			Dimensioni carattere:
 		</text>
 		<combo_box name="chat_font_size">
 			<item label="Piccolo" name="Small" value="0"/>
@@ -14,10 +14,7 @@
 		</combo_box>
 		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Notifiche
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			IM degli amici:
 		</text>
@@ -25,8 +22,9 @@
 			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
 			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			IM non di amici:
 		</text>
@@ -34,8 +32,9 @@
 			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
 			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			IM conferenza:
 		</text>
@@ -43,8 +42,9 @@
 			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
 			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			Chat di gruppo:
 		</text>
@@ -52,8 +52,9 @@
 			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
 			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			Chat nei dintorni:
 		</text>
@@ -61,13 +62,24 @@
 			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
 			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IM di oggetti:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Riproduci suono:
 		</text>
@@ -76,7 +88,7 @@
 		<check_box label="Offerta di Teleport" name="teleport_offer"/>
 		<check_box label="Offerta inventario" name="inventory_offer"/>
 	</panel>
-	<panel>
+	<panel name="log_settings">
 		<button label="Cancella registro..." name="clear_log"/>
 		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
 		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
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 1f2b97af45..e7483b1ba5 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Luci locali" name="LocalLights"/>
 		<check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
 		<check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Luci e ombre" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
 		<check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 0189d47f45..4c190197b4 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Installa automaticamente" name="Install_automatically"/>
 		<combo_box.item label="Scarica e installa manualmente gli aggiornamenti" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Disponibile agli aggiornamenti con versioni non rilasciate" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Impostazioni proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml
index d7ee8230b3..feee8b1927 100755
--- a/indra/newview/skins/default/xui/it/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/it/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Seleziona tutto" name="Select All"/>
 			<menu_item_call label="Deseleziona" name="Deselect"/>
 			<menu_item_call label="Cerca / Sostituisci..." name="Search / Replace..."/>
+			<menu_item_call label="Passa alla riga..." name="Go to line..."/>
 		</menu>
 		<menu label="Guida" name="Help">
 			<menu_item_call label="Aiuto..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
new file mode 100644
index 0000000000..4e515563ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Texture" name="Texture">
+	<panel.string name="string repeats per meter">
+		Ripetizioni al metro
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Ripetizioni per faccia
+	</panel.string>
+	<text name="color label">
+		Colore
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+	<text name="color trans">
+		Trasparenza %
+	</text>
+	<text name="glow label">
+		Bagliore
+	</text>
+	<check_box label="Luminosità massima" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Materiali" name="Materials"/>
+		<combo_box.item label="Multimedia" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Texture (diffusa)" name="Texture (diffuse)"/>
+		<combo_box.item label="Irregolarità (normale)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Lucentezza (speculare)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere una fotografia"/>
+	<text name="label alphamode">
+		Modalità Alfa
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Nessuno" name="None"/>
+		<combo_box.item label="Miscelazione Alfa" name="Alpha blending"/>
+		<combo_box.item label="Mascheratura Alfa" name="Alpha masking"/>
+		<combo_box.item label="Mascheratura emissiva" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Limite mascheratura
+	</text>
+	<texture_picker label="Texture" name="bumpytexture control" tool_tip="Clicca per scegliere una fotografia"/>
+	<text name="label bumpiness">
+		Irregolarità
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Nessuno" name="None"/>
+		<combo_box.item label="Luminosità" name="Brightness"/>
+		<combo_box.item label="Oscurità" name="Darkness"/>
+		<combo_box.item label="venatura" name="woodgrain"/>
+		<combo_box.item label="corteccia" name="bark"/>
+		<combo_box.item label="mattoni" name="bricks"/>
+		<combo_box.item label="scacchiera" name="checker"/>
+		<combo_box.item label="cemento" name="concrete"/>
+		<combo_box.item label="incrostatura" name="crustytile"/>
+		<combo_box.item label="gemma" name="cutstone"/>
+		<combo_box.item label="dischi" name="discs"/>
+		<combo_box.item label="ciottoli" name="gravel"/>
+		<combo_box.item label="batteri" name="petridish"/>
+		<combo_box.item label="rivestimento" name="siding"/>
+		<combo_box.item label="lastricato" name="stonetile"/>
+		<combo_box.item label="stucco" name="stucco"/>
+		<combo_box.item label="suzione" name="suction"/>
+		<combo_box.item label="trama" name="weave"/>
+	</combo_box>
+	<texture_picker label="Texture" name="shinytexture control" tool_tip="Clicca per scegliere una fotografia"/>
+	<text name="label shininess">
+		Lucentezza
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Nessuna" name="None"/>
+		<combo_box.item label="Bassa" name="Low"/>
+		<combo_box.item label="Media" name="Medium"/>
+		<combo_box.item label="Alta" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Patinatura
+	</text>
+	<text name="label environment">
+		Ambiente
+	</text>
+	<text name="label shinycolor">
+		Colore
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+	<text name="media_info">
+		L&apos;URL dell&apos;eventuale elemento multimediale selezionato va qui
+	</text>
+	<button label="Scegli..." name="add_media" tool_tip="Aggiungi elemento multimediale"/>
+	<button label="Rimuovi" name="delete_media" tool_tip="Cancella questa texture dell&apos;elemento multimediale"/>
+	<button label="Alllinea" label_selected="Allinea elmento multimediale" name="button align" tool_tip="Allinea texture dell&apos;elemento multimediale (il caricamento deve prima essere completato)"/>
+	<text name="tex gen">
+		Mappatura
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Predefinita" name="Default"/>
+		<combo_box.item label="Planare" name="Planar"/>
+	</combo_box>
+	<spinner label="Scala orizzontale" name="TexScaleU"/>
+	<spinner label="Scala veritcale" name="TexScaleV"/>
+	<spinner label="Ripetizioni al metro" name="rptctrl"/>
+	<spinner label="Gradi di rotazione" name="TexRot"/>
+	<spinner label="Spostamento orizzontale" name="TexOffsetU"/>
+	<spinner label="Spostamento verticale" name="TexOffsetV"/>
+	<spinner label="Scala orizzontale" name="bumpyScaleU"/>
+	<spinner label="Scala veritcale" name="bumpyScaleV"/>
+	<spinner label="Gradi di rotazione" name="bumpyRot"/>
+	<spinner label="Spostamento orizzontale" name="bumpyOffsetU"/>
+	<spinner label="Spostamento verticale" name="bumpyOffsetV"/>
+	<spinner label="Scala orizzontale" name="shinyScaleU"/>
+	<spinner label="Scala veritcale" name="shinyScaleV"/>
+	<spinner label="Gradi di rotazione" name="shinyRot"/>
+	<spinner label="Spostamento orizzontale" name="shinyOffsetU"/>
+	<spinner label="Spostamento verticale" name="shinyOffsetV"/>
+	<check_box initial_value="falso" label="Allinea facce planari" name="checkbox planar align" tool_tip="Allinea le texture su tutte le facce selezionate con l’ultima faccia selezionata. È richiesta la mappatura planare delle texture."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
index 300e6cf721..3ccb674ed0 100755
--- a/indra/newview/skins/default/xui/it/role_actions.xml
+++ b/indra/newview/skins/default/xui/it/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Queste abilità permettono di cambiare il nome del lotto, le impostazioni di pubblicazione, la visibilità negli elenchi e il punto di arrivo, nonché opzioni di indirizzamento del Teleport." name="Parcel Identity">
 		<action description="Premi Mostra luogo nella ricerca e seleziona una categoria" longdescription="Premi Mostra luogo nella ricerca e seleziona una categoria di lotto in Informazioni sul terreno &gt; scheda Opzioni." name="land find places" value="17"/>
-		<action description="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca" longdescription="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca. Ciò viene fatto in Informazioni sul terreno &gt; scheda Opzioni." name="land change identity" value="18"/>
+		<action description="Cambia il nome, la descrizione e le impostazioni &apos;Contenuto Moderato&apos; per il lotto" longdescription="Cambia il nome, la descrizione e le impostazioni &apos;Contenuto Moderato&apos; per il lotto. Ciò viene fatto in Informazioni sul terreno &gt; scheda Opzioni." name="land change identity" value="18"/>
 		<action description="Impostare il punto di arrivo e l&apos;indirizzamento del Teleport" longdescription="In un lotto di proprietà di un gruppo, i membri con questo ruolo e abilità possono impostare un punto di arrivo per i teleport entranti e impostare anche l&apos;indirizzamento del teleport per ulteriore precisione. Viene fatto in Informazioni sul terreno &gt; Opzioni." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Queste abilità hanno poteri relativi alle opzioni dei lotti, come la creazione di oggetti, la modifica del terreno e le impostazioni per la musica e gli elementi multimediali." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f95318542b..160df911d3 100755
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -136,6 +136,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download.
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
 http://secondlife.com/download.
@@ -445,6 +448,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="SLappAgentRequestFriend">
 		Richiesta di amicizia
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Rimozione amico
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Chiudi (⌘W)
 	</string>
@@ -832,6 +838,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="multiple_textures">
 		Multiple
 	</string>
+	<string name="use_texture">
+		Usa texture
+	</string>
 	<string name="texture_loading">
 		Caricamento in corso...
 	</string>
@@ -928,6 +937,21 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="TeleportYourAgent">
 		Teleportarti
 	</string>
+	<string name="JoinAnExperience">
+		Partecipa a un&apos;esperienza
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Omette gli avvisi durante la gestione degli elenchi di accesso alle proprietà immobiliari
+	</string>
+	<string name="OverrideYourAnimations">
+		Sostituisce le animazioni predefinite
+	</string>
+	<string name="ScriptReturnObjects">
+		Restituisce oggetti per conto tuo
+	</string>
+	<string name="UnknownScriptPermission">
+		(sconosciuto)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generale
 	</string>
@@ -1953,6 +1977,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD basso a destra
 	</string>
+	<string name="ATTACH_NECK">
+		Collo
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centro avatar
+	</string>
 	<string name="CursorPos">
 		Riga [LINE], Colonna [COLUMN]
 	</string>
@@ -2940,6 +2970,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="Hip Width">
 		Larghezza bacino
 	</string>
+	<string name="Hover">
+		Muovi sopra
+	</string>
 	<string name="In">
 		Dentro
 	</string>
@@ -4994,4 +5027,7 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="logging_calls_enabled_log_empty">
 		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
 	</string>
+	<string name="loading_chat_logs">
+		Caricamento in corso...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index eae52c98ec..63a4e69c10 100755
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -8,7 +8,9 @@
 		コンパイラー [COMPILER] [COMPILER_VERSION] バージョン
 	</floater.string>
 	<floater.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]）
+		あなたの現在地は、[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;
+(グローバル座標 [POSITION_0,number,1]、[POSITION_1,number,1]、[POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index d8d0164618..1b5a745cc4 100755
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="中身の権限の編集">
+<floater name="floaterbulkperms" title="コンテンツ権限を調整">
 	<floater.string name="nothing_to_modify_text">
 		選択した中に編集できないものが含まれています
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="すべてに √" label_selected="全て" name="check_all"/>
 	<button label="クリア" label_selected="なし" name="check_none"/>
 	<text name="newperms">
-		新しい中身の権限
+		コンテンツ権限を以下に調整
 	</text>
 	<text name="GroupLabel">
 		グループ：
@@ -49,6 +49,7 @@
 	<check_box label="修正" name="next_owner_modify"/>
 	<check_box label="コピー" name="next_owner_copy"/>
 	<check_box initial_value="true" label="再販・プレゼント" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販することができます"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="適用" name="apply"/>
 	<button label="キャンセル" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_goto_line.xml b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
new file mode 100644
index 0000000000..5f2717ace5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="行に移動">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		行に移動
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index a44c843df7..7ed46f7f01 100755
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index 9733c61918..ec107f3e6b 100755
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				表示：
 			</text>
-			<check_box label="テスト" name="show_world"/>
+			<check_box label="世界" name="show_world"/>
 			<check_box label="可動物のみ" name="show_world_movables_only"/>
 			<check_box label="ナビメッシュ" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 5adf0b3745..930af10692 100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="フリーズ" name="Freeze..."/>
 	<menu_item_call label="追放" name="Eject..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払う" name="Pay..."/>
 	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
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 6036e1075e..d87ef8e2a0 100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="グループ" name="Groups..."/>
 	<menu_item_call label="プロフィール" name="Profile..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="下に落とす" name="Drop"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
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 54dd96f5ef..f9cadc36ac 100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="フリーズ" name="Freeze..."/>
 	<menu_item_call label="追放" name="Eject..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払う" name="Pay..."/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
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 4709522665..eb8e98059a 100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="グループ" name="Groups..."/>
 	<menu_item_call label="プロフィール" name="Profile..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index c7df20d252..66940471da 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="会話を終える" name="close_conversation"/>
 	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
 	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
+	<menu_item_call label="選択した項目を閉じる" name="close_selected_conversations"/>
 	<menu_item_call label="プロフィールを表示" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index 89c122f14f..3754bd7fa4 100755
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="入場許可を購入" name="Land Buy Pass"/>
 	<menu_item_call label="制作" name="Create"/>
 	<menu_item_call label="地形を編集" name="Edit Terrain"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index ab6d9e3546..3918732fa8 100755
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="利用規約を表示" name="TOS"/>
 		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
 		<menu_item_call label="Web コンテンツフローターのデバッグテスト" name="Web Content Floater Debug Test"/>
-		<menu label="ログレベルを設定" name="Set Logging Level"/>
+		<menu label="ログレベルを設定" name="Set Logging Level">
+			<menu_item_check label="デバッグ" name="Debug"/>
+			<menu_item_check label="情報" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="エラー" name="Error"/>
+			<menu_item_check label="なし" name="None"/>
+		</menu>
 		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
 		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
new file mode 100644
index 0000000000..8dab025309
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 01436ad12b..39c32bc41e 100755
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -5,13 +5,13 @@
 	</menu_item_call>
 	<menu_item_call label="編集" name="Edit..."/>
 	<menu_item_call label="制作" name="Build"/>
-	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
-	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
 	<menu_item_call label="開く" name="Open"/>
 	<menu_item_call label="ここに座る" name="Object Sit"/>
 	<menu_item_call label="立ち上がる" name="Object Stand Up"/>
 	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
+	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
+	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
 	<context_menu label="装着" name="Put On">
 		<menu_item_call label="装着" name="Wear"/>
 		<menu_item_call label="追加" name="Add"/>
@@ -28,4 +28,5 @@
 	<menu_item_call label="支払う" name="Pay..."/>
 	<menu_item_call label="買う" name="Buy..."/>
 	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 72722db7cc..639602ce3c 100755
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="プロフィールを表示" name="show_agent"/>
 	<menu_item_call label="IM を送信..." name="send_im"/>
 	<menu_item_call label="フレンドを追加..." name="add_friend"/>
+	<menu_item_call label="フレンドを削除..." name="remove_friend"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index 9e340e3239..a02ca8415d 100755
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
+	<menu_item_call label="ブロック..." name="block_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 89f58d3bac..b1ec62115c 100755
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="ログイン" name="Status"/>
+		<menu label="ログイン" name="Status">
+			<menu_item_check label="一時退席中" name="Away"/>
+			<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="Manage My Account">
@@ -32,6 +35,7 @@
 		<menu_item_check label="会話..." name="Conversations"/>
 		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
+		<menu_item_check label="会話ログ..." name="Conversation Log..."/>
 		<menu label="ボイスモーフィング" name="VoiceMorphing">
 			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
 			<menu_item_check label="プレビュー..." name="Preview"/>
@@ -42,6 +46,7 @@
 		<menu_item_check label="グループ" name="My Groups"/>
 		<menu_item_check label="近くにいる人" name="Active Speakers"/>
 		<menu_item_call label="リストをブロック" name="Block List"/>
+		<menu_item_check label="着信拒否" name="Do Not Disturb"/>
 	</menu>
 	<menu label="世界" name="World">
 		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
 			<menu_item_call label="次の部分を含める" name="Include Next Part"/>
 			<menu_item_call label="前回の部分を含める" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="リンクセット..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/>
 		<menu_item_call label="選択したものをズームする" name="Zoom to Selection"/>
 		<menu label="オブジェクト" name="Object">
@@ -279,6 +285,7 @@
 			<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
 			<menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/>
 			<menu_item_check label="フレームテスト" name="Frame Test"/>
+			<menu_item_call label="フレームプロフィール" name="Frame Profile"/>
 		</menu>
 		<menu label="メタデータのレンダー" name="Render Metadata">
 			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
@@ -313,9 +320,10 @@
 			<menu_item_check label="軸" name="Axes"/>
 			<menu_item_check label="接線基底" name="Tangent Basis"/>
 			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
+			<menu_item_call label="選択したマテリアル情報" name="Selected Material Info"/>
 			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
 			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="光と影" name="Advanced Lighting Model"/>
+			<menu_item_check label="高度なライティングモデル" name="Advanced Lighting Model"/>
 			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL デバッグ" name="Debug GL"/>
@@ -325,7 +333,6 @@
 			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
 			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
 			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
-			<menu_item_check label="テクスチャアトラス（試験段階）" name="Texture Atlas"/>
 			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
 			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
 			<menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects"/>
@@ -361,7 +368,6 @@
 			<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
 			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
 			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
-			<menu_item_call label="メモリ使用状況" name="Memory Stats"/>
 			<menu_item_check label="地域デバッグコンソール" name="Region Debug Console"/>
 			<menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
 			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 356506f191..f1c916bf53 100755
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -150,7 +150,7 @@
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
-		フレンド以外からのコールやインスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
+		フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="FavoritesOnLogin">
@@ -221,6 +221,14 @@
 この能力を [ROLE_NAME] に割り当てますか？
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		[AVATAR_NAME] をグループから追放しようとしています。
+		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		[COUNT] 名のメンバーをグループから追放しようとしています。
+		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		アタッチメントを下に置こうとしています。
 続けますか？
@@ -1139,7 +1147,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
 金額を増やしてください。
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		ここにリンクされたアイテムが少なくとも1つあります。  このアイテムを削除するとここにリンクされたものが機能しなくなります。  リンクを先に削除することを強くお勧めします。
+		1 つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。まず最初にリンクを削除することを強くお勧めします。
 
 これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
@@ -1157,9 +1165,9 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		選択したアイテムのうち、少なくとも 1 つがあなたの所有物ではありません。
+		選択したアイテムの 1 つ以上を所有していません。
 
-本当に削除しますか？
+これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1170,26 +1178,26 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		少なくとも 1 つのオブジェクトがロックされています。
-少なくとも 1 つのオブジェクトが、あなたの所有物ではありません。
+		1 つ以上のオブジェクトがロックされました。
+1 つ以上のオブジェクトを所有していません。
 
-本当に削除しますか？
+これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		少なくとも 1 つのオブジェクトがコピーできません。
-少なくとも 1 つのオブジェクトが、あなたの所有物ではありません。
+		1 つ以上のオブジェクトがコピーできません。
+1 つ以上のオブジェクトを所有していません。
 
-本当に削除しますか？
+これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		少なくとも 1 つのオブジェクトがロックされています。
-少なくとも 1 つのオブジェクトがコピーできません。
-少なくとも 1 つのオブジェクトが、あなたの所有物ではありません。
+		1 つ以上のオブジェクトがロックされています。
+1 つ以上のオブジェクトがコピーできません。
+1 つ以上のオブジェクトを所有していません。
 
-本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
+これらのアイテムを削除しますか？
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		少なくとも 1 つのオブジェクトがロックされています。
@@ -1513,13 +1521,43 @@ http://secondlife.com/download から最新バージョンをダウンロード
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		必要なソフトウェアのアップデートをダウンロードしました。
-バージョン [VERSION]
+バージョン [VERSION] [[INFO_URL] このアップデートに関する情報]
 
 アップデートをインストールするには [APP_NAME] を再起動する必要があります。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+[[INFO_URL] このアップデートに関する情報]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		お使いの [APP_NAME] に必要なアップデートをダウンロードしました。
+バージョン [VERSION] 
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+このアップデートの詳細については、[[INFO_URL] を参照してください]
+		<usetemplate name="okcancelbuttons" notext="後で実行" yestext="今すぐインストールして [APP_NAME] を再起動"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		お使いの [APP_NAME] に必要なアップデートをダウンロードしました。
+バージョン [VERSION]
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+[[INFO_URL] このアップデートに関する情報] を参照
+		<usetemplate name="okcancelbuttons" notext="後で実行" yestext="今すぐインストールして [APP_NAME] を再起動"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		必要なソフトウェアのアップデートをダウンロードしました。
+バージョン [VERSION]
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+[[INFO_URL] このアップデートに関する情報] を参照
+
+アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+[[INFO_URL] このアップデートに関する情報] を参照
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1572,6 +1610,10 @@ http://secondlife.com/download から最新バージョンをダウンロード
 グループから脱退しますか？
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		本当に住人全員をグリッドから追い出しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
@@ -2443,9 +2485,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 「テレポート」を選択して実行することもできます。）
 	</notification>
 	<notification name="TeleportToPerson">
-		[NAME] のような住人に連絡をとるには、「人」ボタンをクリックし、表示されるウィンドウで「住人」を選択してから、
-ウィンドウ下部にある「IM」をクリックします。
-（リストの名前をダブルクリック、または右クリックして「IM」を選んでも同じです。）
+		誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「IM」を選択します。
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		サーバーの境界を越えて土地を選択することできません。
@@ -2820,6 +2860,15 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 			<button name="Deny" text="拒否"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		&apos;[NAME]&apos; が所有する &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; によってリクエストされたランタイムスクリプト権限がビューアによって認識されないため、許可できません。
+
+この権限を許可するには、ビューアを [DOWNLOADURL] からの最新バージョンにアップデートしてください。
+		<form name="form">
+			<button name="Deny" text="Ok"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		[NAME] の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 03ce87537a..dd8fd41681 100755
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -49,6 +49,9 @@
 				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
 				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
 			</panel>
+			<text name="groupcount">
+				あなたは[COUNT]グループに属しているので、まだ[REMAINING]参加できます。
+			</text>
 		</panel>
 		<panel label="最新" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index ae5391c7bd..1c3204ea04 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<panel>
+	<panel name="general_chat_settings">
 		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
 		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
 		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
@@ -14,71 +14,83 @@
 		</combo_box>
 		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			通知
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			フレンド IM:
 		</text>
 		<combo_box name="FriendIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
-			非フレンド IM:
+			フレンドのいない IM:
 		</text>
 		<combo_box name="NonFriendIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
-			コンファレンス IM:
+			会議 IM:
 		</text>
 		<combo_box name="ConferenceIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			グループチャット:
 		</text>
 		<combo_box name="GroupChatOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="なし" name="None" value="none"/>
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			近くのチャット:
 		</text>
 		<combo_box name="NearbyChatOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			オブジェクト IM：
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_object_im"/>
 		<text name="notifications_alert">
-			すべての通知を一時的に受け付けないようにするには、「コミュニケート」&gt;「通知を受けない」を使用します。
+			一時的にすべての通知を停止するには、「コミュニケーション」 &gt; 「着信拒否]を使用します。
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
-			音の再生:
+			サウンドを再生:
 		</text>
 		<check_box label="新しい会話" name="new_conversation"/>
-		<check_box label="ボイスコールの着信" name="incoming_voice_call"/>
-		<check_box label="テレポートを渡す" name="teleport_offer"/>
-		<check_box label="アイテムのオファー" name="inventory_offer"/>
+		<check_box label="受信音声コール" name="incoming_voice_call"/>
+		<check_box label="テレポートを送る" name="teleport_offer"/>
+		<check_box label="インベントリを送る" name="inventory_offer"/>
 	</panel>
-	<panel>
-		<button label="ログのクリア..." name="clear_log"/>
-		<button label="テキストの削除..." name="delete_transcripts"/>
+	<panel name="log_settings">
+		<button label="ログを消去..." name="clear_log"/>
+		<button label="テキストチャットを削除..." name="delete_transcripts"/>
 		<button label="参照..." label_selected="参照" name="log_path_button"/>
 	</panel>
 	<button label="他の言語..." name="ok_btn"/>
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 1786b4befc..15017e330e 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="近くの光" name="LocalLights"/>
 		<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
 		<check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="光と影" name="UseLightShaders"/>
+		<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
 		<check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
 		<check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index d90a1632ab..2c0359cb15 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="自動的にインストール" name="Install_automatically"/>
 		<combo_box.item label="手動でアップデートをダウンロード&amp;インストール" name="Install_manual"/>
 	</combo_box>
+	<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		プロキシ設定：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index 14d55002a3..b6d51085eb 100755
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="すべて選択" name="Select All"/>
 			<menu_item_call label="選択解除" name="Deselect"/>
 			<menu_item_call label="検索 / 再配置..." name="Search / Replace..."/>
+			<menu_item_call label="行に移動..." name="Go to line..."/>
 		</menu>
 		<menu label="ヘルプ" name="Help">
 			<menu_item_call label="ヘルプ..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
new file mode 100644
index 0000000000..34763f78c1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="テクスチャ" name="Texture">
+	<panel.string name="string repeats per meter">
+		メーターごとに繰り返す
+	</panel.string>
+	<panel.string name="string repeats per face">
+		面ごとに繰り返す
+	</panel.string>
+	<text name="color label">
+		色
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="color trans">
+		透過度 %
+	</text>
+	<text name="glow label">
+		グロー
+	</text>
+	<check_box label="明るさ全開" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="材質" name="Materials"/>
+		<combo_box.item label="メディア" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="テクスチャ (拡散)" name="Texture (diffuse)"/>
+		<combo_box.item label="凹凸 (標準)" name="Bumpiness (normal)"/>
+		<combo_box.item label="輝き (反射)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
+	<text name="label alphamode">
+		アルファモード
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="アルファブレンディング" name="Alpha blending"/>
+		<combo_box.item label="アルファマスキング" name="Alpha masking"/>
+		<combo_box.item label="放射状マスク" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		マスクカットオフ
+	</text>
+	<texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして写真を選択します"/>
+	<text name="label bumpiness">
+		凹凸
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="明るさ" name="Brightness"/>
+		<combo_box.item label="暗さ" name="Darkness"/>
+		<combo_box.item label="木目調" name="woodgrain"/>
+		<combo_box.item label="バーク" name="bark"/>
+		<combo_box.item label="レンガ" name="bricks"/>
+		<combo_box.item label="市松模様" name="checker"/>
+		<combo_box.item label="コンクリート" name="concrete"/>
+		<combo_box.item label="堅いタイル" name="crustytile"/>
+		<combo_box.item label="カットストーン" name="cutstone"/>
+		<combo_box.item label="円板" name="discs"/>
+		<combo_box.item label="小石" name="gravel"/>
+		<combo_box.item label="ペトリ皿" name="petridish"/>
+		<combo_box.item label="サイディング" name="siding"/>
+		<combo_box.item label="ストーンタイル" name="stonetile"/>
+		<combo_box.item label="化粧しっくい" name="stucco"/>
+		<combo_box.item label="サクション" name="suction"/>
+		<combo_box.item label="ウィーブ" name="weave"/>
+	</combo_box>
+	<texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして写真を選択します"/>
+	<text name="label shininess">
+		輝き
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="低" name="Low"/>
+		<combo_box.item label="中" name="Medium"/>
+		<combo_box.item label="高" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		光沢度
+	</text>
+	<text name="label environment">
+		環境
+	</text>
+	<text name="label shinycolor">
+		色
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="media_info">
+		選択したメディアの URL がもしあれば、ここに入ります
+	</text>
+	<button label="選択..." name="add_media" tool_tip="メディアを追加します"/>
+	<button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
+	<button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）"/>
+	<text name="tex gen">
+		マッピング
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="デフォルト" name="Default"/>
+		<combo_box.item label="平面" name="Planar"/>
+	</combo_box>
+	<spinner label="水平スケール" name="TexScaleU"/>
+	<spinner label="垂直スケール" name="TexScaleV"/>
+	<spinner label="メーターごとに繰り返す" name="rptctrl"/>
+	<spinner label="回転度" name="TexRot"/>
+	<spinner label="水平オフセット" name="TexOffsetU"/>
+	<spinner label="垂直オフセット" name="TexOffsetV"/>
+	<spinner label="水平スケール" name="bumpyScaleU"/>
+	<spinner label="垂直スケール" name="bumpyScaleV"/>
+	<spinner label="回転度" name="bumpyRot"/>
+	<spinner label="水平オフセット" name="bumpyOffsetU"/>
+	<spinner label="垂直オフセット" name="bumpyOffsetV"/>
+	<spinner label="水平スケール" name="shinyScaleU"/>
+	<spinner label="垂直スケール" name="shinyScaleV"/>
+	<spinner label="回転度" name="shinyRot"/>
+	<spinner label="水平オフセット" name="shinyOffsetU"/>
+	<spinner label="垂直オフセット" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index 896ed556ae..5c2e18df03 100755
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
 	<action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
 		<action description="このグループに人を招待" longdescription="「役割」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1"/>
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびに TP ルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
 		<action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」 &gt; 「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17"/>
-		<action description="区画名、説明、「場所検索に表示」の設定を変更" longdescription="区画名、説明、「場所検索に表示」の設定を変更します。 「土地情報」 &gt; 「オプション」タブで行います。" name="land change identity" value="18"/>
+		<action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderate コンテンツ」設定を変更します。「土地情報」 &gt; 「オプション」タブで行います。" name="land change identity" value="18"/>
 		<action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。 この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index b27904c4d7..ab2fd461ab 100755
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -139,6 +139,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
 http://secondlife.com/download
@@ -448,6 +451,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="SLappAgentRequestFriend">
 		フレンド登録リクエスト
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		フレンドの削除
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		閉じる （⌘W）
 	</string>
@@ -838,6 +844,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="multiple_textures">
 		複数
 	</string>
+	<string name="use_texture">
+		テクスチャを使用
+	</string>
 	<string name="texture_loading">
 		ローディング...
 	</string>
@@ -937,6 +946,21 @@ support@secondlife.com にお問い合わせください。
 	<string name="TeleportYourAgent">
 		あなたをテレポート
 	</string>
+	<string name="JoinAnExperience">
+		体験に参加する
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		土地のアクセスリストを管理するときにアラートを表示しない
+	</string>
+	<string name="OverrideYourAnimations">
+		デフォルトのアニメーションを置き換え
+	</string>
+	<string name="ScriptReturnObjects">
+		あなたの代わりにオブジェクトを返却
+	</string>
+	<string name="UnknownScriptPermission">
+		(不明)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1968,6 +1992,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD（右下）
 	</string>
+	<string name="ATTACH_NECK">
+		首
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		アバターの中央
+	</string>
 	<string name="CursorPos">
 		[LINE] 行目、[COLUMN] 列目
 	</string>
@@ -2997,6 +3027,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Hip Width">
 		腰の幅
 	</string>
+	<string name="Hover">
+		ホバー
+	</string>
 	<string name="In">
 		内向き
 	</string>
@@ -5081,4 +5114,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="logging_calls_enabled_log_empty">
 		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
 	</string>
+	<string name="loading_chat_logs">
+		ロード中...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index d089266342..47975a6386 100755
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -7,7 +7,9 @@
 		Construído com [COMPILER] versão [COMPILER_VERSION]
 	</floater.string>
 	<floater.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 [HOSTNAME]&lt;/nolink&gt;([HOSTIP])
+		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])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(coordenadas globais [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
index 8823d04b62..998fa8b2d6 100755
--- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDITAR AUTORIZAÇÕES DE CONTEÚDO">
+<floater name="floaterbulkperms" title="AJUSTAR PERMISSÕES DE CONTEÚDO">
 	<floater.string name="nothing_to_modify_text">
 		A seleção não contém nenhum conteúdo editável.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="Tudo" label_selected="Todas" name="check_all"/>
 	<button label="Limpar" label_selected="Nenhuma" name="check_none"/>
 	<text name="newperms">
-		Novas autorizações de conteúdo
+		Ajustar permissões de conteúdo para
 	</text>
 	<text name="GroupLabel">
 		Grupo:
@@ -49,6 +49,7 @@
 	<check_box label="Modificar" name="next_owner_modify"/>
 	<check_box label="Copiar" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transferir" name="next_owner_transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Aplicar" name="apply"/>
 	<button label="Cancelar" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_goto_line.xml b/indra/newview/skins/default/xui/pt/floater_goto_line.xml
new file mode 100644
index 0000000000..f2ef825ba0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="IR PARA A LINHA">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Ir para a linha
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 9f6a7a06ad..e592b14fa7 100755
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traduzir conversa" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index d04cf2a173..182f2513e0 100755
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Exibir:
 			</text>
-			<check_box label="Testar" name="show_world"/>
+			<check_box label="Mundo" name="show_world"/>
 			<check_box label="Apenas móveis" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 cfd69158bc..61953f9f78 100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Ejetar" name="Eject..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
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 5b32784c32..2d4cd670e6 100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Largar" name="Drop"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
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 a4a26144c7..1af8d64438 100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Ejetar" name="Eject..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
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 e84dcb093d..447b77657b 100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
index 01316b887d..2dd150a61e 100644
--- a/indra/newview/skins/default/xui/pt/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
 	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
 	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Fechar selecionados" name="close_selected_conversations"/>
 	<menu_item_call label="Exibir perfil" name="view_profile"/>
 	<menu_item_call label="MI" name="im"/>
 	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml
index 9182ce321a..2ebe85df6e 100755
--- a/indra/newview/skins/default/xui/pt/menu_land.xml
+++ b/indra/newview/skins/default/xui/pt/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Comprar passe" name="Land Buy Pass"/>
 	<menu_item_call label="Construir" name="Create"/>
 	<menu_item_call label="Editar a topografia" name="Edit Terrain"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index be94ad49db..cd840f3137 100755
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -17,7 +17,13 @@
 		<menu_item_call label="Mostrar TOS" name="TOS"/>
 		<menu_item_call label="Mostrar mensagem crítica" name="Critical"/>
 		<menu_item_call label="Test de Bugs de Conteúdo Web" name="Web Content Floater Debug Test"/>
-		<menu label="Configurar nível de registro em log" name="Set Logging Level"/>
+		<menu label="Configurar nível de registro em log" name="Set Logging Level">
+			<menu_item_check label="Depurar" name="Debug"/>
+			<menu_item_check label="Info" name="Info"/>
+			<menu_item_check label="Aviso" name="Warning"/>
+			<menu_item_check label="Erro" name="Error"/>
+			<menu_item_check label="Nenhum" name="None"/>
+		</menu>
 		<menu_item_check label="Exibir seletor da grade" name="Show Grid Picker"/>
 		<menu_item_call label="Exibir painel de notificações" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_mute_particle.xml b/indra/newview/skins/default/xui/pt/menu_mute_particle.xml
new file mode 100644
index 0000000000..be13c66d7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index 28dd9febe2..a552a5de5a 100755
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -5,13 +5,13 @@
 	</menu_item_call>
 	<menu_item_call label="Editar" name="Edit..."/>
 	<menu_item_call label="Construir" name="Build"/>
-	<menu_item_call label="Exibir em linksets" name="show_in_linksets"/>
-	<menu_item_call label="Exibir em personagens" name="show_in_characters"/>
 	<menu_item_call label="Abrir" name="Open"/>
 	<menu_item_call label="Sentar aqui" name="Object Sit"/>
 	<menu_item_call label="Ficar de pé" name="Object Stand Up"/>
 	<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
+	<menu_item_call label="Exibir em linksets" name="show_in_linksets"/>
+	<menu_item_call label="Exibir em personagens" name="show_in_characters"/>
 	<context_menu label="Colocar no(a)" name="Put On">
 		<menu_item_call label="Vestir" name="Wear"/>
 		<menu_item_call label="Adicionar" name="Add"/>
@@ -28,4 +28,5 @@
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Comprar" name="Buy..."/>
 	<menu_item_call label="Excluir" name="Delete"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index aa0a426405..102df18b28 100755
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Exibir perfil" name="show_agent"/>
 	<menu_item_call label="Enviar MI..." name="send_im"/>
 	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
+	<menu_item_call label="Remover amigo..." name="remove_friend"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index 247a92567a..2cd0f52ef3 100755
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Perfil do objeto..." name="show_object"/>
+	<menu_item_call label="Bloquear..." name="block_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 15814fed4c..e6eceb5f2f 100755
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status"/>
+		<menu label="Status" name="Status">
+			<menu_item_check label="Ausente" name="Away"/>
+			<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="Painel da conta..." name="Manage My Account">
@@ -32,6 +35,7 @@
 		<menu_item_check label="Conversas..." name="Conversations"/>
 		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
+		<menu_item_check label="Registro de conversas..." name="Conversation Log..."/>
 		<menu label="Distorção de voz" name="VoiceMorphing">
 			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
 			<menu_item_check label="Visualizar..." name="Preview"/>
@@ -42,6 +46,7 @@
 		<menu_item_check label="Grupos" name="My Groups"/>
 		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
 		<menu_item_call label="Lista de bloqueados" name="Block List"/>
+		<menu_item_check label="Não perturbe" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
 			<menu_item_call label="Incluir próxima parte" name="Include Next Part"/>
 			<menu_item_call label="Incluir parte anterior" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Enfocar seleção" name="Focus on Selection"/>
 		<menu_item_call label="Ampliar seleção" name="Zoom to Selection"/>
 		<menu label="Objeto:" name="Object">
@@ -273,6 +279,7 @@
 			<menu_item_check label="Camera Offset" name="Camera Offset"/>
 			<menu_item_check label="Taxa de quadros aleatória" name="Randomize Framerate"/>
 			<menu_item_check label="Frame Test" name="Frame Test"/>
+			<menu_item_call label="Perfil do quadro" name="Frame Profile"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
 			<menu_item_check label="Normais" name="Normals"/>
@@ -293,15 +300,15 @@
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
+			<menu_item_call label="Informações sobre o material selecionado" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Iluminação e sombras" name="Advanced Lighting Model"/>
+			<menu_item_check label="Modelo avançado de luzes" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras da projeção do sol/lua" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e sombra suave" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Máscaras alpha automáticas (adiadas)" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="Máscaras alpha automáticas (sem adiar)" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Texturas de animação" name="Animation Textures"/>
 			<menu_item_check label="Desativar texturas" name="Disable Textures"/>
-			<menu_item_check label="Atlas texturizado (fase experimental)" name="Texture Atlas"/>
 			<menu_item_check label="Render Attached Lights" name="Render Attached Lights"/>
 			<menu_item_check label="Render Attached Particles" name="Render Attached Particles"/>
 			<menu_item_check label="Objetos iridescentes" name="Hover Glow Objects"/>
@@ -320,7 +327,6 @@
 			<menu_item_call label="Teste de mídia do navegador" name="Web Browser Test"/>
 			<menu_item_call label="Navegador de conteúdo web" name="Web Content Browser"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
-			<menu_item_call label="Dados de memória" name="Memory Stats"/>
 			<menu_item_check label="Console de depuração de região" name="Region Debug Console"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
 			<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index d9f5e48745..d5096ec858 100755
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -209,6 +209,14 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sí mesmo --
 Adicionar esta habilidade a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Você está prestes a expulsar [AVATAR_NAME] do grupo.
+		<usetemplate ignoretext="Confirmar expulsão de um participante do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Você está prestes a expulsar [COUNT] membros do grupo.
+		<usetemplate ignoretext="Confirmar expulsão de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Você está prestes a largar seu anexo. 
     Tem certeza de que quer prosseguir?
@@ -1105,9 +1113,9 @@ em TODOS OS TERRENOS deste sim?
 Por favor, insira um valor maior.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Pelo menos um dos itens possui links que levam a ele.  Ao excluir o item, os links não funcionarão mais.   Por isso, recomendamos excluir os links primeiro.
+		Pelo menos um dos itens possui links que levam a ele.  Ao excluir o item, os links não funcionarão mais.  Por isso, recomendamos excluir os links primeiro.
 
-Tem certeza de que quer excluir estes items?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLock">
@@ -1123,9 +1131,9 @@ Tem certeza de que deseja apagar estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		Você não é proprietário de pelo menos um dos itens selecionados.
+		Ao menos um dos itens selecionados não é seu.
 
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1135,22 +1143,26 @@ Tem certeza de que deseja apagar estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		Pelo menos um dos objetos está trancado ou não é de sua posse.
+		Ao menos um objeto está bloqueado.
+Ao menos um objeto não é seu.
 
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Pelo menos um dos objetos não é copiável ou não é de sua posse.
+		Ao menos um objeto não é copiável.
+Ao menos um objeto não é seu.
 
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		Pelo menos um dos objetos está trancado, não é copiável ou você não o possui.
+		Ao menos um objeto está bloqueado.
+Ao menos um objeto não é copiável.
+Ao menos um objeto não é seu.
 
-Tem certeza de que deseja apagar estes itens?
-		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
+Tem certeza de que quer excluir estes itens?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Pelo menos um dos objetos está trancado.
@@ -1468,13 +1480,43 @@ Versão [VERSION] [[RELEASE_NOTES_FULL_URL] sobre esta atualização]
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		O software requer uma atualização que já foi baixada.
-Versão [VERSION]
+Versão [VERSION] Informação [[INFO_URL] sobre essa atualização]
 
 Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+Informação [[INFO_URL] sobre essa atualização]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Baixamos uma atualização para a instalação do [APP_NAME].
+Versão [VERSION] 
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte [[INFO_URL] para obter mais detalhes sobre essa atualização]
+		<usetemplate name="okcancelbuttons" notext="Depois..." yestext="Instalar agora e reiniciar o [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Baixamos uma atualização para a instalação do [APP_NAME].
+Versão [VERSION]
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
+		<usetemplate name="okcancelbuttons" notext="Depois..." yestext="Instalar agora e reiniciar o [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		O software requer uma atualização que já foi baixada.
+Versão [VERSION]
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
+
+Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1524,6 +1566,10 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Você é atualmente um membro do grupo
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sair"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		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="ConfirmKick">
 		Tem CERTEZA de que deseja expulsar todos os residentes do grid?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/>
@@ -2384,9 +2430,7 @@ Selecione só um objeto.
     e selecionar &apos;Teletransportar&apos;.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Para entrar em contato com residentes como &apos;[NAME]&apos;, clique no botão &quot;Pessoas&quot;, selecione um residente na janela que é exibida e clique em &apos;MI&apos; na
-    parte inferior da janela.
-    (Também é possível clicar duas vezes no nome, ou clicar no nome com o botão direito e selecionar &apos;MI&apos;.)
+		Para iniciar uma conversa particular com alguém, clique com o botão direito no avatar e selecione &quot;MI&quot; no menu.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Impossível selecionar terra nas fronteiras do servidor. Tente selecionar um pedaço menor de terra.
@@ -2757,6 +2801,15 @@ Não conceda acesso se você não entender completamente por que ele deseja aces
 			<button name="Deny" text="Negar"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		A permissão de script de tempo de execução solicitada por &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, um objeto de &apos;[NAME]&apos;, não é reconhecida pelo visualizador e não pode ser concedida.
+
+Para conceder essa permissão, atualize seu visualizador para a versão mais recente em [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="Ok"/>
+			<button name="Mute" text="Bloquear"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index babb48c208..205fd6b97d 100755
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -49,6 +49,9 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
 				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
 			</panel>
+			<text name="groupcount">
+				Você pertence a [COUNT] grupos e pode entrar em mais [REMAINING].
+			</text>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index baf14c2c23..89f1e07647 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-		<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Executar animação de digitação durante o bate-papo" name="play_typing_animation"/>
+		<check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/>
 		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
 		<text name="font_size">
 			Tamanho da fonte:
@@ -12,62 +12,74 @@
 			<item label="Médio" name="Medium" value="1"/>
 			<item label="Grande" name="Large" value="2"/>
 		</combo_box>
-		<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+		<check_box label="Balão de conversa" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Notificações
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			MIs de amigos:
 		</text>
 		<combo_box name="FriendIMOptions">
 			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Executar som" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			MIs de não amigos:
 		</text>
 		<combo_box name="NonFriendIMOptions">
 			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Executar som" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			MIs de conferências:
 		</text>
 		<combo_box name="ConferenceIMOptions">
 			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Executar som" name="play_sound_conference_im"/>
 		<text name="group_chat">
-			Bate-papo de grupo:
+			Conversa em grupo:
 		</text>
 		<combo_box name="GroupChatOptions">
 			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Executar som" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
-			Bate-papo local:
+			Conversa local:
 		</text>
 		<combo_box name="NearbyChatOptions">
 			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			MIs de objetos:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Executar som" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Executar som:
 		</text>
@@ -76,7 +88,7 @@
 		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
 		<check_box label="Oferta de inventário" name="inventory_offer"/>
 	</panel>
-	<panel>
+	<panel name="log_settings">
 		<button label="Limpar registro..." name="clear_log"/>
 		<button label="Excluir transcrições..." name="delete_transcripts"/>
 		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
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 28e7184326..37e8838bf4 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -31,7 +31,7 @@ rápido
 		<check_box initial_value="verdadeiro" label="Luzes locais" name="LocalLights"/>
 		<check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vídeo a travem."/>
 		<check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="verdadeiro" label="Iluminação e sombras" name="UseLightShaders"/>
+		<check_box initial_value="verdadeiro" label="Modelo avançado de luzes" name="UseLightShaders"/>
 		<check_box initial_value="verdadeiro" label="Oclusão ambiental" name="UseSSAO"/>
 		<check_box initial_value="verdadeiro" label="Profundidade" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index ebbd63138a..887d0cfe98 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Instalar automaticamente" name="Install_automatically"/>
 		<combo_box.item label="Baixar e instalar atualizações manualmente" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Disposto a atualizar para candidatos da versão" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Configurações de proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
index de02aafe2f..39bb5edc75 100755
--- a/indra/newview/skins/default/xui/pt/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Selecionar tudo" name="Select All"/>
 			<menu_item_call label="Desmarcar" name="Deselect"/>
 			<menu_item_call label="Buscar / Substituir..." name="Search / Replace..."/>
+			<menu_item_call label="Ir para a linha..." name="Go to line..."/>
 		</menu>
 		<menu label="Ajuda" name="Help">
 			<menu_item_call label="ajuda..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
new file mode 100644
index 0000000000..03da89dd3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Textura" name="Texture">
+	<panel.string name="string repeats per meter">
+		Repetições por metro
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Repetições por face
+	</panel.string>
+	<text name="color label">
+		Cor
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Selecionar a cor"/>
+	<text name="color trans">
+		% de transparência
+	</text>
+	<text name="glow label">
+		Brilho
+	</text>
+	<check_box label="Completamente luminoso" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Materiais" name="Materials"/>
+		<combo_box.item label="Mídia" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Textura (difusa)" name="Texture (diffuse)"/>
+		<combo_box.item label="Relevo (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Brilho (especular)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Textura" name="texture control" tool_tip="Selecionar imagem"/>
+	<text name="label alphamode">
+		Modo alpha
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Nenhum" name="None"/>
+		<combo_box.item label="Mistura alpha" name="Alpha blending"/>
+		<combo_box.item label="Máscara alpha" name="Alpha masking"/>
+		<combo_box.item label="Máscara emissiva" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Corte da máscara
+	</text>
+	<texture_picker label="Textura" name="bumpytexture control" tool_tip="Selecionar imagem"/>
+	<text name="label bumpiness">
+		Relevo
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Nenhum" name="None"/>
+		<combo_box.item label="Luminosidade" name="Brightness"/>
+		<combo_box.item label="Escuridão" name="Darkness"/>
+		<combo_box.item label="grão de madeira" name="woodgrain"/>
+		<combo_box.item label="casca de árvore" name="bark"/>
+		<combo_box.item label="tijolos" name="bricks"/>
+		<combo_box.item label="quadriculado" name="checker"/>
+		<combo_box.item label="concreto" name="concrete"/>
+		<combo_box.item label="ladrilho ríspido" name="crustytile"/>
+		<combo_box.item label="pedra talhada" name="cutstone"/>
+		<combo_box.item label="discos" name="discs"/>
+		<combo_box.item label="cascalho" name="gravel"/>
+		<combo_box.item label="placa de petri" name="petridish"/>
+		<combo_box.item label="desvio" name="siding"/>
+		<combo_box.item label="ladrilho de pedra" name="stonetile"/>
+		<combo_box.item label="estuque" name="stucco"/>
+		<combo_box.item label="sucção" name="suction"/>
+		<combo_box.item label="tecelagem" name="weave"/>
+	</combo_box>
+	<texture_picker label="Textura" name="shinytexture control" tool_tip="Selecionar imagem"/>
+	<text name="label shininess">
+		Brilho
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Nenhum" name="None"/>
+		<combo_box.item label="Baixo" name="Low"/>
+		<combo_box.item label="Médio" name="Medium"/>
+		<combo_box.item label="Alto" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Acetinação
+	</text>
+	<text name="label environment">
+		Ambiente
+	</text>
+	<text name="label shinycolor">
+		Cor
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Selecionar a cor"/>
+	<text name="media_info">
+		A URL da mídia escolhida, caso haja, é inserida aqui
+	</text>
+	<button label="Selecionar..." name="add_media" tool_tip="Adicionar mídia"/>
+	<button label="Remover" name="delete_media" tool_tip="Excluir esta textura de mídia"/>
+	<button label="Alinhar" label_selected="Alinhar mídia" name="button align" tool_tip="Alinhar texturas de mídia (após carregar mídia)"/>
+	<text name="tex gen">
+		Mapeamento
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Padrão" name="Default"/>
+		<combo_box.item label="Planar" name="Planar"/>
+	</combo_box>
+	<spinner label="Escala horizontal" name="TexScaleU"/>
+	<spinner label="Escala vertical" name="TexScaleV"/>
+	<spinner label="Repetições por metro" name="rptctrl"/>
+	<spinner label="Graus de rotação" name="TexRot"/>
+	<spinner label="Offset horizontal" name="TexOffsetU"/>
+	<spinner label="Offset vertical" name="TexOffsetV"/>
+	<spinner label="Escala horizontal" name="bumpyScaleU"/>
+	<spinner label="Escala vertical" name="bumpyScaleV"/>
+	<spinner label="Graus de rotação" name="bumpyRot"/>
+	<spinner label="Offset horizontal" name="bumpyOffsetU"/>
+	<spinner label="Offset vertical" name="bumpyOffsetV"/>
+	<spinner label="Escala horizontal" name="shinyScaleU"/>
+	<spinner label="Escala vertical" name="shinyScaleV"/>
+	<spinner label="Graus de rotação" name="shinyRot"/>
+	<spinner label="Offset horizontal" name="shinyOffsetU"/>
+	<spinner label="Offset vertical" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Alinhar planos planares" name="checkbox planar align" tool_tip="Alinhar texturas de todos os planos selecionados com o plano selecionado por último. Requer mapeamento de textura planar."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
index 21b085431e..e45a3bd21f 100755
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem &amp; opções de rota de TP." name="Parcel Identity">
 		<action description="Alternar &apos;Exibir nos resultados de busca&apos; e selecionar a categoria" longdescription="Alterne entre &apos;Exibir nos resultados de busca&apos; ou não, e selecione a categoria do terreno em &apos;Sobre o terreno&apos;." name="land find places" value="17"/>
-		<action description="Mude o nome, a descrição e a exibição do terreno nos resultados de busca." longdescription="Mude o nome, a descrição e a exibição do terreno nos resultados de busca.  Veja essas opções em Sobre o terreno &gt; guia Opções." name="land change identity" value="18"/>
+		<action description="Alterar nome da parcela, descrição e configurações de &quot;Conteúdo moderado&quot;" longdescription="Altere o nome da parcela, descrição e configurações de &quot;Conteúdo moderado&quot;. Isso é feito em Sobre o terreno &gt; guia Opções." name="land change identity" value="18"/>
 		<action description="Definir ponto de aterrissagem e rota de teletransporte" longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno &gt; aba Opções." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Estas habilidade incluem poderes que afetam opções de parcela, como &apos;Criar objetos&apos;, &apos;Editar terreno&apos; e música &amp; configurações de mídia." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 4bf18aab70..adc3ee14e0 100755
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -130,6 +130,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
 
@@ -400,6 +403,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="SLappAgentRequestFriend">
 		Pedido de amizade
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Remoção de amigo
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Fechar (⌘W)
 	</string>
@@ -787,6 +793,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="multiple_textures">
 		Múltiplo
 	</string>
+	<string name="use_texture">
+		Usar textura
+	</string>
 	<string name="texture_loading">
 		Carregando...
 	</string>
@@ -883,6 +892,21 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="TeleportYourAgent">
 		Teletransportá-lo
 	</string>
+	<string name="JoinAnExperience">
+		Participar de uma experiência
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Suprimir alertas ao gerenciar listas de acesso ao terreno
+	</string>
+	<string name="OverrideYourAnimations">
+		Substituir suas animações padrão
+	</string>
+	<string name="ScriptReturnObjects">
+		Retornar objetos em seu nome
+	</string>
+	<string name="UnknownScriptPermission">
+		(desconhecido)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Público geral
 	</string>
@@ -1908,6 +1932,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD direito inferior
 	</string>
+	<string name="ATTACH_NECK">
+		Pescoço
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centro do avatar
+	</string>
 	<string name="CursorPos">
 		Linha [LINE], Coluna [COLUMN]
 	</string>
@@ -2894,6 +2924,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Hip Width">
 		Largura do quadril
 	</string>
+	<string name="Hover">
+		Pairar
+	</string>
 	<string name="In">
 		Dentro
 	</string>
@@ -4951,4 +4984,7 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="logging_calls_enabled_log_empty">
 		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
 	</string>
+	<string name="loading_chat_logs">
+		Carregando...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 2b2b3cf453..9494106e96 100755
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -9,6 +9,8 @@
 	</floater.string>
 	<floater.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;
+(глобальные координаты [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
index ccf13cf02a..31fc1c5ed3 100755
--- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="ИЗМЕНИТЬ РАЗРЕШЕНИЯ НА ИСПОЛЬЗОВАНИЕ КОНТЕНТА">
+<floater name="floaterbulkperms" title="НАСТРОИТЬ РАЗРЕШЕНИЯ НА ИСПОЛЬЗОВАНИЕ КОНТЕНТА">
 	<floater.string name="nothing_to_modify_text">
 		В выбранной области нет контента, который можно изменять.
 	</floater.string>
@@ -24,7 +24,7 @@
 	<button label="√ Все" name="check_all"/>
 	<button label="Очистить" label_selected="Нет" name="check_none"/>
 	<text name="newperms">
-		Новые разрешения на контент
+		Настроить разрешения на использование контента:
 	</text>
 	<text name="GroupLabel">
 		Группа:
@@ -40,6 +40,7 @@
 	<check_box label="Изменять" name="next_owner_modify"/>
 	<check_box label="Копировать" name="next_owner_copy"/>
 	<check_box initial_value="истина" label="Передать" name="next_owner_transfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
-	<button label="ОК" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Применить" name="apply"/>
 	<button label="Отмена" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_goto_line.xml b/indra/newview/skins/default/xui/ru/floater_goto_line.xml
new file mode 100644
index 0000000000..51caaa471d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ПЕРЕЙТИ НА СТРОКУ">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Перейти на строку
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index ea110ffb44..d4ca04b88b 100755
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Переводить чат" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Переводить чат" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index 8faddb1805..fa72df04fd 100755
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Показать:
 			</text>
-			<check_box label="Тест" name="show_world"/>
+			<check_box label="Мир" name="show_world"/>
 			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
 			<check_box label="Навигационная сетка" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 fb1c24448b..76acb32a64 100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Заморозить" name="Freeze..."/>
 	<menu_item_call label="Выкинуть" name="Eject..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
 	<menu_item_call label="Заплатить" name="Pay..."/>
 	<menu_item_call label="Профиль объекта" name="Object Inspect"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
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 f241b48871..2b1291a8d5 100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Мои группы" name="Groups..."/>
 	<menu_item_call label="Мой профиль" name="Profile..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Бросить" name="Drop"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
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 fb283c9d80..dfe3c2e701 100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Заморозить" name="Freeze..."/>
 	<menu_item_call label="Выкинуть" name="Eject..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
 	<menu_item_call label="Заплатить" name="Pay..."/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
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 b72f3dcc42..e09117226c 100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Мои группы" name="Groups..."/>
 	<menu_item_call label="Мой профиль" name="Profile..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
index 530b1ea704..4d1240db98 100644
--- a/indra/newview/skins/default/xui/ru/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
 	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
 	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
+	<menu_item_call label="Закрыть выбранные" name="close_selected_conversations"/>
 	<menu_item_call label="Смотреть профиль" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml
index 89889d7bf6..5aa4e6ccd2 100755
--- a/indra/newview/skins/default/xui/ru/menu_land.xml
+++ b/indra/newview/skins/default/xui/ru/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Купить пропуск" name="Land Buy Pass"/>
 	<menu_item_call label="Строительство" name="Create"/>
 	<menu_item_call label="Изменить ландшафт" name="Edit Terrain"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 93a5ffbb25..835c4e186e 100755
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Показать лицензионное соглашение" name="TOS"/>
 		<menu_item_call label="Показать сообщение об ошибке" name="Critical"/>
 		<menu_item_call label="Тест отладки плавающего окна с веб-контентом" name="Web Content Floater Debug Test"/>
-		<menu label="Уровень журнала" name="Set Logging Level"/>
+		<menu label="Уровень журнала" name="Set Logging Level">
+			<menu_item_check label="Отладка" name="Debug"/>
+			<menu_item_check label="Информация" name="Info"/>
+			<menu_item_check label="Внимание!" name="Warning"/>
+			<menu_item_check label="Ошибка" name="Error"/>
+			<menu_item_check label="Нет" name="None"/>
+		</menu>
 		<menu_item_check label="Выбор сетки" name="Show Grid Picker"/>
 		<menu_item_call label="Консоль уведомлений" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_mute_particle.xml b/indra/newview/skins/default/xui/ru/menu_mute_particle.xml
new file mode 100644
index 0000000000..0c5a147419
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
index 288df3beb9..056dab74c1 100755
--- a/indra/newview/skins/default/xui/ru/menu_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object.xml
@@ -3,13 +3,13 @@
 	<menu_item_call label="Коснуться" name="Object Touch"/>
 	<menu_item_call label="Изменить" name="Edit..."/>
 	<menu_item_call label="Строительство" name="Build"/>
-	<menu_item_call label="Показывать в наборах связей" name="show_in_linksets"/>
-	<menu_item_call label="Показывать в персонажах" name="show_in_characters"/>
 	<menu_item_call label="Открыто" name="Open"/>
 	<menu_item_call label="Сесть здесь" name="Object Sit"/>
 	<menu_item_call label="Встать" name="Object Stand Up"/>
 	<menu_item_call label="Профиль объекта" name="Object Inspect"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
+	<menu_item_call label="Показывать в наборах связей" name="show_in_linksets"/>
+	<menu_item_call label="Показывать в персонажах" name="show_in_characters"/>
 	<context_menu label="Надеть" name="Put On">
 		<menu_item_call label="Надеть" name="Wear"/>
 		<menu_item_call label="Добавить" name="Add"/>
@@ -26,4 +26,5 @@
 	<menu_item_call label="Заплатить" name="Pay..."/>
 	<menu_item_call label="Купить" name="Buy..."/>
 	<menu_item_call label="Удалить" name="Delete"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 230d049fad..fcd1fe310d 100755
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Смотреть профиль" name="show_agent"/>
 	<menu_item_call label="Отправить сообщение..." name="send_im"/>
 	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
+	<menu_item_call label="Удалить из друзей..." name="remove_friend"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 1326db708e..4f5361b2e3 100755
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Профиль объекта..." name="show_object"/>
+	<menu_item_call label="Блокировать..." name="block_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 92a9943b93..fcb7c4e531 100755
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Статус" name="Status"/>
+		<menu label="Статус" name="Status">
+			<menu_item_check label="Нет на месте" name="Away"/>
+			<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="Manage My Account"/>
@@ -30,6 +33,7 @@
 		<menu_item_check label="Разговоры..." name="Conversations"/>
 		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
+		<menu_item_check label="Журнал разговора..." name="Conversation Log..."/>
 		<menu label="Изменение голоса" name="VoiceMorphing">
 			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
 			<menu_item_check label="Просмотр..." name="Preview"/>
@@ -40,6 +44,7 @@
 		<menu_item_check label="Группы" name="My Groups"/>
 		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
 		<menu_item_call label="Черный список" name="Block List"/>
+		<menu_item_check label="Не беспокоить" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Мир" name="World">
 		<menu_item_call label="Добавить закладку на это место" name="Create Landmark Here"/>
@@ -108,13 +113,13 @@
 			<menu_item_call label="Включить следующую" name="Include Next Part"/>
 			<menu_item_call label="Включить предыдущую" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Наборы связей..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Фокус на выбранном" name="Focus on Selection"/>
 		<menu_item_call label="Приблизить к выбранному" name="Zoom to Selection"/>
 		<menu label="Объект" name="Object">
 			<menu_item_call label="Купить" name="Menu Object Buy"/>
 			<menu_item_call label="Взять" name="Menu Object Take"/>
 			<menu_item_call label="Взять копию" name="Take Copy"/>
-			<menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
 		</menu>
@@ -270,6 +275,7 @@
 			<menu_item_check label="Случайная частота кадров" name="Randomize Framerate"/>
 			<menu_item_check label="Периодическое замедление кадров" name="Periodic Slow Frame"/>
 			<menu_item_check label="Тест кадров" name="Frame Test"/>
+			<menu_item_call label="Профиль кадра" name="Frame Profile"/>
 		</menu>
 		<menu label="Визуализировать метаданные" name="Render Metadata">
 			<menu_item_check label="Рамки" name="Bounding Boxes"/>
@@ -304,9 +310,10 @@
 			<menu_item_check label="Оси" name="Axes"/>
 			<menu_item_check label="Касательный базис" name="Tangent Basis"/>
 			<menu_item_call label="Выбранная текстура в основе" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Сведения о выбранном материале" name="Selected Material Info"/>
 			<menu_item_check label="Каркас" name="Wireframe"/>
 			<menu_item_check label="Смыкание объектов" name="Object-Object Occlusion"/>
-			<menu_item_check label="Освещение и тени" name="Advanced Lighting Model"/>
+			<menu_item_check label="Расширенная модель освещения" name="Advanced Lighting Model"/>
 			<menu_item_check label="Тени от солнца, луны и прожекторов" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO и сглаживание теней" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Отладка GL" name="Debug GL"/>
@@ -316,7 +323,6 @@
 			<menu_item_check label="Текстуры анимаций" name="Animation Textures"/>
 			<menu_item_check label="Отключить текстуры" name="Disable Textures"/>
 			<menu_item_check label="Текстуры в полном разрешении" name="Rull Res Textures"/>
-			<menu_item_check label="Атлас текстур (экспериментальная функция)" name="Texture Atlas"/>
 			<menu_item_check label="Визуализация присоединенных источников света" name="Render Attached Lights"/>
 			<menu_item_check label="Визуализация присоединенных частиц" name="Render Attached Particles"/>
 			<menu_item_check label="Парящие светящиеся объекты" name="Hover Glow Objects"/>
@@ -352,7 +358,6 @@
 			<menu_item_call label="Вывод средства фокусировки" name="Dump Focus Holder"/>
 			<menu_item_call label="Печать информации о выбранных объектах" name="Print Selected Object Info"/>
 			<menu_item_call label="Печать информации об агенте" name="Print Agent Info"/>
-			<menu_item_call label="Статистическая информация о памяти" name="Memory Stats"/>
 			<menu_item_check label="Консоль отладки региона" name="Region Debug Console"/>
 			<menu_item_check label="Отладка SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Отладка щелчков мышью" name="Debug Clicks"/>
@@ -386,7 +391,6 @@
 			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
-			<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
 			<menu_item_check label="Показать указание" name="Show Point At"/>
 			<menu_item_check label="Отладка обновленных движений суставов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 00ab0b5763..1dc8202b00 100755
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -210,6 +210,14 @@
 Добавить эту способность к роли «[ROLE_NAME]»?
 		<usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Вы собираетесь исключить [AVATAR_NAME] из группы.
+		<usetemplate ignoretext="Подтвердите исключение участника из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Вы собираетесь исключить [COUNT] участников из группы.
+		<usetemplate ignoretext="Подтвердите исключение участников из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Вы собираетесь сбросить свое присоединение.
     Продолжить?
@@ -1111,7 +1119,7 @@
 Введите более высокую цену.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Имеется ссылка, указывающая как минимум на один из выбранных вами предметов.  Если удалить этот предмет, его ссылки перестанут работать.  Настоятельно рекомендуется сначала удалить ссылки.
+		По крайней мере у одного предмета есть ссылки, указывающие на него.  Если удалить этот предмет, его ссылки перестанут работать.  Настоятельно рекомендуется сначала удалить ссылки.
 
 Действительно удалить эти предметы?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
@@ -1161,7 +1169,7 @@
 Вы не владеете по крайней мере одним объектом.
 
 Действительно удалить эти предметы?
-		<usetemplate name="okcancelbuttons" notext="отмена" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Как минимум один объект фиксирован.
@@ -1480,13 +1488,43 @@ http://secondlife.com/download.
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Загружено обязательное обновление.
-Версия [VERSION]
+Версия [VERSION]. [[INFO_URL] Сведения об этом обновлении]
 
 Необходимо перезапустить [APP_NAME] для установки обновления.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Необходимо перезапустить [APP_NAME] для установки обновления.
+[[INFO_URL] Сведения об этом обновлении]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Загружено обновление для вашей версии [APP_NAME].
+Версия [VERSION] 
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] об этом обновлении]
+		<usetemplate name="okcancelbuttons" notext="Позже..." yestext="Установите обновление и перезапустите [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Загружено обновление для вашей версии [APP_NAME].
+Версия [VERSION]
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] Сведения об этом обновлении]
+		<usetemplate name="okcancelbuttons" notext="Позже..." yestext="Установите обновление и перезапустите [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Загружено обязательное обновление.
+Версия [VERSION]
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] Сведения об этом обновлении]
+
+Необходимо перезапустить [APP_NAME] для установки обновления.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Необходимо перезапустить [APP_NAME] для установки обновления.
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] Сведения об этом обновлении]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1537,6 +1575,10 @@ http://secondlife.com/download.
 Хотите покинуть группу?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Невозможно покинуть группу. Вы не можете покинуть группу, так как вы ее последний владелец. Сначала назначьте владельцем другого участника.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Вы ДЕЙСТВИТЕЛЬНО хотите выбросить всех жителей с сетки?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Выбросить всех жителей"/>
@@ -2396,9 +2438,7 @@ http://secondlife.com/download.
     выбрать команду «Телепортация».)
 	</notification>
 	<notification name="TeleportToPerson">
-		Чтобы обратиться к жителю, например «[NAME]», нажмите кнопку «Люди», выберите жителя в появившемся окне и нажмите кнопку
-    «IM» внизу окна.
-    (Также можно дважды щелкнуть имя жителя в списке или щелкнуть его правой кнопкой мыши и выбрать команду «IM».)
+		Чтобы начать личный разговор, щелкните аватар собеседника правой кнопкой мыши и выберите в меню «IM».
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Нельзя выбрать землю с обеих сторон границы между серверами.
@@ -2772,6 +2812,15 @@ http://secondlife.com/download.
 			<button name="Deny" text="Отклонить"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		Объект &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» владельца «[NAME]» требует разрешения на выполнение скрипта; разрешение не распознается клиентом и не будет предоставлено
+
+Для получения этого разрешения установите последнюю версию клиента из [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="OK"/>
+			<button name="Mute" text="Заблокировать"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		[NAME] – «&lt;nolink&gt;[TITLE]&lt;/nolink&gt;»
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 7da7fb3191..9606f0aec1 100755
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -49,6 +49,9 @@
 				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
 				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
 			</panel>
+			<text name="groupcount">
+				Вы входите в [COUNT] групп и можете присоединиться еще к [REMAINING].
+			</text>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 6383fc8c2c..914426c91e 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<panel>
-		<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
 		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
 		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
 		<text name="font_size">
@@ -14,10 +14,7 @@
 		</combo_box>
 		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Уведомления
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			IM друзей:
 		</text>
@@ -25,8 +22,9 @@
 			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
 			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Звук" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			IM чужих:
 		</text>
@@ -34,8 +32,9 @@
 			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
 			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Звук" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			IM конференции:
 		</text>
@@ -43,8 +42,9 @@
 			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
 			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Звук" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			Групповой чат:
 		</text>
@@ -52,8 +52,9 @@
 			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
 			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Звук" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			Локальный чат:
 		</text>
@@ -61,13 +62,24 @@
 			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
 			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IM объектов:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Звук" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Звук:
 		</text>
@@ -76,7 +88,7 @@
 		<check_box label="Предложение телепортации" name="teleport_offer"/>
 		<check_box label="Предложение инвентаря" name="inventory_offer"/>
 	</panel>
-	<panel>
+	<panel name="log_settings">
 		<button label="Очистить журнал..." name="clear_log"/>
 		<button label="Удалить записи..." name="delete_transcripts"/>
 		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
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 a7e826f5fc..029e72e137 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="истина" label="Локальный свет" name="LocalLights"/>
 		<check_box initial_value="истина" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение этого параметра может предотвратить зависание некоторых видеокарт"/>
 		<check_box initial_value="истина" label="Атмосферные шейдеры" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="истина" label="Освещение и тени" name="UseLightShaders"/>
+		<check_box initial_value="истина" label="Расширенная модель освещения" name="UseLightShaders"/>
 		<check_box initial_value="истина" label="Объемный свет" name="UseSSAO"/>
 		<check_box initial_value="истина" label="Глубина поля" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index 8e7fc71f0d..e9c0c7de10 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Устанавливать автоматически" name="Install_automatically"/>
 		<combo_box.item label="Загружать и устанавливать обновления вручную" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Устанавливать бета-версии" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Настройки прокси-сервера:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
index 05ccaeb54b..a9e5d9ef10 100755
--- a/indra/newview/skins/default/xui/ru/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Выделить все" name="Select All"/>
 			<menu_item_call label="Снять выделение" name="Deselect"/>
 			<menu_item_call label="Поиск и замена..." name="Search / Replace..."/>
+			<menu_item_call label="Перейти на строку..." name="Go to line..."/>
 		</menu>
 		<menu label="Справка" name="Help">
 			<menu_item_call label="Справка..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
new file mode 100644
index 0000000000..60717a3d1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Текстура" name="Texture">
+	<panel.string name="string repeats per meter">
+		Повторений на метр
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Повторений на грань
+	</panel.string>
+	<text name="color label">
+		Цвет
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Щелкните для выбора цвета"/>
+	<text name="color trans">
+		Прозрачность %
+	</text>
+	<text name="glow label">
+		Свечение
+	</text>
+	<check_box label="Собственная яркость" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Материалы" name="Materials"/>
+		<combo_box.item label="Медиа" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Текстура (рассеянная)" name="Texture (diffuse)"/>
+		<combo_box.item label="Шероховатость (обычная)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Блеск (зеркальный)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Текстура" name="texture control" tool_tip="Щелкните для выбора изображения"/>
+	<text name="label alphamode">
+		Альфа-режим
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Нет" name="None"/>
+		<combo_box.item label="Альфа-смешивание" name="Alpha blending"/>
+		<combo_box.item label="Альфа-маскирование" name="Alpha masking"/>
+		<combo_box.item label="Излучающая маска" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Отсечка маски
+	</text>
+	<texture_picker label="Текстура" name="bumpytexture control" tool_tip="Щелкните для выбора изображения"/>
+	<text name="label bumpiness">
+		Рельефность
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Нет" name="None"/>
+		<combo_box.item label="Яркость" name="Brightness"/>
+		<combo_box.item label="По темному" name="Darkness"/>
+		<combo_box.item label="дерево" name="woodgrain"/>
+		<combo_box.item label="кора" name="bark"/>
+		<combo_box.item label="кирпич" name="bricks"/>
+		<combo_box.item label="шахматная доска" name="checker"/>
+		<combo_box.item label="бетон" name="concrete"/>
+		<combo_box.item label="старая плитка" name="crustytile"/>
+		<combo_box.item label="тесаный камень" name="cutstone"/>
+		<combo_box.item label="диски" name="discs"/>
+		<combo_box.item label="гравий" name="gravel"/>
+		<combo_box.item label="чашка Петри" name="petridish"/>
+		<combo_box.item label="сайдинг" name="siding"/>
+		<combo_box.item label="каменная плитка" name="stonetile"/>
+		<combo_box.item label="штукатурка" name="stucco"/>
+		<combo_box.item label="присоска" name="suction"/>
+		<combo_box.item label="переплетение" name="weave"/>
+	</combo_box>
+	<texture_picker label="Текстура" name="shinytexture control" tool_tip="Щелкните для выбора изображения"/>
+	<text name="label shininess">
+		Блеск
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Нет" name="None"/>
+		<combo_box.item label="Низкий" name="Low"/>
+		<combo_box.item label="Средний" name="Medium"/>
+		<combo_box.item label="Высокий" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Глянец
+	</text>
+	<text name="label environment">
+		Среда
+	</text>
+	<text name="label shinycolor">
+		Цвет
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Щелкните для выбора цвета"/>
+	<text name="media_info">
+		URL выбранного медиа (если есть)
+	</text>
+	<button label="Выбрать..." name="add_media" tool_tip="Добавить медиа"/>
+	<button label="Удалить" name="delete_media" tool_tip="Удалить медиа-текстуру"/>
+	<button label="Выровнять" label_selected="Выровнять медиа" name="button align" tool_tip="Масштабирование медиа-текстуры (сначала нужно загрузить)"/>
+	<text name="tex gen">
+		Наложение
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="По умолчанию" name="Default"/>
+		<combo_box.item label="На плоскость" name="Planar"/>
+	</combo_box>
+	<spinner label="Масштаб по горизонтали" name="TexScaleU"/>
+	<spinner label="Масштаб по вертикали" name="TexScaleV"/>
+	<spinner label="Повторений на метр" name="rptctrl"/>
+	<spinner label="Поворот, градусы" name="TexRot"/>
+	<spinner label="Смещение по горизонтали" name="TexOffsetU"/>
+	<spinner label="Смещение по вертикали" name="TexOffsetV"/>
+	<spinner label="Масштаб по горизонтали" name="bumpyScaleU"/>
+	<spinner label="Масштаб по вертикали" name="bumpyScaleV"/>
+	<spinner label="Поворот, градусы" name="bumpyRot"/>
+	<spinner label="Смещение по горизонтали" name="bumpyOffsetU"/>
+	<spinner label="Смещение по вертикали" name="bumpyOffsetV"/>
+	<spinner label="Масштаб по горизонтали" name="shinyScaleU"/>
+	<spinner label="Масштаб по вертикали" name="shinyScaleV"/>
+	<spinner label="Поворот, градусы" name="shinyRot"/>
+	<spinner label="Смещение по горизонтали" name="shinyOffsetU"/>
+	<spinner label="Смещение по вертикали" name="shinyOffsetV"/>
+	<check_box initial_value="ложь" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml
index b6ba818abd..3f31ecfa10 100755
--- a/indra/newview/skins/default/xui/ru/role_actions.xml
+++ b/indra/newview/skins/default/xui/ru/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="К этим способностям относится изменение названия участка и публикация настроек, поиск видимых каталогов, а также настройки точек и вариантов телепортации." name="Parcel Identity">
 		<action description="Включение-отключение показа места в результатах поиска и настройка категории" longdescription="Включить-отключить показ места в результатах поиска и настроить категорию участка можно в окне «О земле» на вкладке «Параметры»." name="land find places" value="17"/>
-		<action description="Изменение названия или описания участка, настройки «Показать место в поиске»" longdescription="Изменение названия или описания участка, настройки «Показать место в поиске». Это можно выполнить в окне «О земле» на вкладке «Параметры»." name="land change identity" value="18"/>
+		<action description="Изменение названия или описания участка, настройки «Умеренный контент»" longdescription="Изменение названия или описания участка, настройки «Умеренный контент». Это можно выполнить в окне «О земле» на вкладке «Параметры»." name="land change identity" value="18"/>
 		<action description="Установка конечной точки и варианта телепортации" longdescription="Участники роли с этой способностью могут установить конечную точку телепортации на участке группы, а также задать вариант телепортации для усиления контроля. Это можно выполнить в окне «О земле» на вкладке «Параметры»." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="К этим способностям относится изменение настроек участка, в т. ч. «Создать объекты», «Изменить ландшафт», а также настройки музыки и медиа." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index d7d4df4a37..49ce33ec96 100755
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -139,6 +139,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
 http://secondlife.com/download
@@ -448,6 +451,9 @@ support@secondlife.com.
 	<string name="SLappAgentRequestFriend">
 		Предложить дружбу
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Удаление друга
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Закрыть (⌘W)
 	</string>
@@ -835,6 +841,9 @@ support@secondlife.com.
 	<string name="multiple_textures">
 		Несколько
 	</string>
+	<string name="use_texture">
+		Использовать текстуру
+	</string>
 	<string name="texture_loading">
 		Загрузка...
 	</string>
@@ -934,6 +943,21 @@ support@secondlife.com.
 	<string name="TeleportYourAgent">
 		Телепортировать вас
 	</string>
+	<string name="JoinAnExperience">
+		Присоединитесь
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Отключить извещения при управлении списками доступа к землевладениям
+	</string>
+	<string name="OverrideYourAnimations">
+		Заменить ваши стандартные анимации
+	</string>
+	<string name="ScriptReturnObjects">
+		Вернуть объекты от вашего имени
+	</string>
+	<string name="UnknownScriptPermission">
+		(неизвестно)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -1965,6 +1989,12 @@ support@secondlife.com.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		Данные в игре внизу справа
 	</string>
+	<string name="ATTACH_NECK">
+		Шея
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Центр аватара
+	</string>
 	<string name="CursorPos">
 		Строка [LINE], столбец [COLUMN]
 	</string>
@@ -2991,6 +3021,9 @@ support@secondlife.com.
 	<string name="Hip Width">
 		Ширина бедер
 	</string>
+	<string name="Hover">
+		Наведите
+	</string>
 	<string name="In">
 		Внутрь
 	</string>
@@ -5087,4 +5120,7 @@ support@secondlife.com.
 	<string name="logging_calls_enabled_log_empty">
 		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
 	</string>
+	<string name="loading_chat_logs">
+		Загрузка...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 4dcf6200c6..7b925e8830 100755
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -9,6 +9,8 @@
 	</floater.string>
 	<floater.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
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(küresel koordinatlar [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
index 1d929a2dd3..bf4473ce1f 100755
--- a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="İÇERİK İZİNLERİNİ DÜZENLE">
+<floater name="floaterbulkperms" title="İÇERİK İZİNLERİNİ AYARLA">
 	<floater.string name="nothing_to_modify_text">
 		Seçim içerisinde düzenlenebilir içerik yok.
 	</floater.string>
@@ -24,7 +24,7 @@
 	<button label="√ Tümü" name="check_all"/>
 	<button label="Temizle" label_selected="Hiçbiri" name="check_none"/>
 	<text name="newperms">
-		Yeni İçerik İzinleri
+		Şunun İçin İçerik İzinlerini Ayarla:
 	</text>
 	<text name="GroupLabel">
 		Grup:
@@ -40,6 +40,7 @@
 	<check_box label="Değiştir" name="next_owner_modify"/>
 	<check_box label="Kopyala" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Aktar" name="next_owner_transfer" tool_tip="Sonraki sahibi bu nesneyi verebilir veya tekrar satabilir"/>
-	<button label="Tamam" name="apply"/>
+	<button label="Tamam" name="ok"/>
+	<button label="Uygula" name="apply"/>
 	<button label="İptal" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_goto_line.xml b/indra/newview/skins/default/xui/tr/floater_goto_line.xml
new file mode 100644
index 0000000000..673fe553cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ŞU SATIRA GİT:">
+	<button label="Tamam" label_selected="Tamam" name="goto_btn"/>
+	<text name="txt">
+		Şu satıra git:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index 8ce8f0fe13..52a10feeef 100755
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 35f47e6dfa..6eecc7fb77 100755
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Göster:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Dünya" name="show_world"/>
 			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
 			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 9ba214ff31..0cb233a657 100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Dondur" name="Freeze..."/>
 	<menu_item_call label="Çıkar" name="Eject..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
 	<menu_item_call label="Öde" name="Pay..."/>
 	<menu_item_call label="Nesne Profili" name="Object Inspect"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
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 16d1e3f356..ff7c718979 100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Gruplarım" name="Groups..."/>
 	<menu_item_call label="Profilim" name="Profile..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Bırak" name="Drop"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
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 7d691d2ac5..0da328a894 100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Dondur" name="Freeze..."/>
 	<menu_item_call label="Çıkar" name="Eject..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
 	<menu_item_call label="Öde" name="Pay..."/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
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 c520aff521..6996dc612f 100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Gruplarım" name="Groups..."/>
 	<menu_item_call label="Profilim" name="Profile..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
index 31404f2501..c2773cdc26 100644
--- a/indra/newview/skins/default/xui/tr/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
 	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
 	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
+	<menu_item_call label="Seçileni Kapat" name="close_selected_conversations"/>
 	<menu_item_call label="Profili Göster" name="view_profile"/>
 	<menu_item_call label="Aİ" name="im"/>
 	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml
index db65f1af1e..d6d8dbf730 100755
--- a/indra/newview/skins/default/xui/tr/menu_land.xml
+++ b/indra/newview/skins/default/xui/tr/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Geçiş Hakkı Satın Al" name="Land Buy Pass"/>
 	<menu_item_call label="İnşa Et" name="Create"/>
 	<menu_item_call label="Yüzeyi Düzenle" name="Edit Terrain"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
index f27908bf7a..79c95407e8 100755
--- a/indra/newview/skins/default/xui/tr/menu_login.xml
+++ b/indra/newview/skins/default/xui/tr/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Hizmet Şartlarını Göster" name="TOS"/>
 		<menu_item_call label="Kritik İletiyi Göster" name="Critical"/>
 		<menu_item_call label="Web İçeriği Gezdiricisi Hata Ayıklama Testi" name="Web Content Floater Debug Test"/>
-		<menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level"/>
+		<menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level">
+			<menu_item_check label="Hata ayıkla" name="Debug"/>
+			<menu_item_check label="Bilgi" name="Info"/>
+			<menu_item_check label="Uyarı" name="Warning"/>
+			<menu_item_check label="Hata" name="Error"/>
+			<menu_item_check label="Hiçbiri" name="None"/>
+		</menu>
 		<menu_item_check label="Izgara Seçiciyi Göster" name="Show Grid Picker"/>
 		<menu_item_call label="Bildirimler Konsolunu Göster" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_mute_particle.xml b/indra/newview/skins/default/xui/tr/menu_mute_particle.xml
new file mode 100644
index 0000000000..a05a745ed0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml
index 72f7adf016..2f8b5c0362 100755
--- a/indra/newview/skins/default/xui/tr/menu_object.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object.xml
@@ -3,13 +3,13 @@
 	<menu_item_call label="Dokun" name="Object Touch"/>
 	<menu_item_call label="Düzenle" name="Edit..."/>
 	<menu_item_call label="İnşa Et" name="Build"/>
-	<menu_item_call label="Bağlantı kümelerinde göster" name="show_in_linksets"/>
-	<menu_item_call label="Karakterlerde göster" name="show_in_characters"/>
 	<menu_item_call label="Aç" name="Open"/>
 	<menu_item_call label="Buraya Otur" name="Object Sit"/>
 	<menu_item_call label="Kalk" name="Object Stand Up"/>
 	<menu_item_call label="Nesne Profili" name="Object Inspect"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
+	<menu_item_call label="Bağlantı kümelerinde göster" name="show_in_linksets"/>
+	<menu_item_call label="Karakterlerde göster" name="show_in_characters"/>
 	<context_menu label="Üzerine Koy" name="Put On">
 		<menu_item_call label="Giy" name="Wear"/>
 		<menu_item_call label="Ekle" name="Add"/>
@@ -26,4 +26,5 @@
 	<menu_item_call label="Öde" name="Pay..."/>
 	<menu_item_call label="Satın Al" name="Buy..."/>
 	<menu_item_call label="Sil" name="Delete"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index b14a0509bf..109cd62495 100755
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Profili Göster" name="show_agent"/>
 	<menu_item_call label="Aİ Gönder..." name="send_im"/>
 	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar..." name="remove_friend"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index 00fa3c27c2..ae68669605 100755
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Nesne Profili..." name="show_object"/>
+	<menu_item_call label="Engelle..." name="block_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 35485bb292..4236f91636 100755
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Durum" name="Status"/>
+		<menu label="Durum" name="Status">
+			<menu_item_check label="Uzakta" name="Away"/>
+			<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="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -30,6 +33,7 @@
 		<menu_item_check label="Sohbetler..." name="Conversations"/>
 		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
+		<menu_item_check label="Sohbet Günlüğü..." name="Conversation Log..."/>
 		<menu label="Ses şekillendirme" name="VoiceMorphing">
 			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
 			<menu_item_check label="Önizleme..." name="Preview"/>
@@ -40,6 +44,7 @@
 		<menu_item_check label="Gruplar" name="My Groups"/>
 		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
 		<menu_item_call label="Engelleme Listesi" name="Block List"/>
+		<menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Dünya" name="World">
 		<menu_item_call label="Bu Yeri Yer İmlerine Ekle" name="Create Landmark Here"/>
@@ -108,6 +113,7 @@
 			<menu_item_call label="Sonraki Parçayı Dahil Et" name="Include Next Part"/>
 			<menu_item_call label="Önceki Parçayı Dahil Et" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Seçime Odaklan" name="Focus on Selection"/>
 		<menu_item_call label="Seçimi Yakınlaştır" name="Zoom to Selection"/>
 		<menu label="Nesne" name="Object">
@@ -277,6 +283,7 @@
 			<menu_item_check label="Çerçeve Hızını Rastgele Seç" name="Randomize Framerate"/>
 			<menu_item_check label="Düzenli Yavaş Çerçeve" name="Periodic Slow Frame"/>
 			<menu_item_check label="Çerçeve Testi" name="Frame Test"/>
+			<menu_item_call label="Çerçeve Profili..." name="Frame Profile"/>
 		</menu>
 		<menu label="Meta Verileri İşle" name="Render Metadata">
 			<menu_item_check label="Sınırlama Kutuları" name="Bounding Boxes"/>
@@ -311,9 +318,10 @@
 			<menu_item_check label="Eksenler" name="Axes"/>
 			<menu_item_check label="Tanjant Temeli" name="Tangent Basis"/>
 			<menu_item_call label="Seçilen Doku Bilgi Temeli" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Seçilen Malzeme Bilgisi" name="Selected Material Info"/>
 			<menu_item_check label="Telkafes" name="Wireframe"/>
 			<menu_item_check label="Görünen Nesneler İçin Gölgeleme" name="Object-Object Occlusion"/>
-			<menu_item_check label="Işıklandırma ve Gölgeler" name="Advanced Lighting Model"/>
+			<menu_item_check label="Gelişmiş Aydınlatma Modeli" name="Advanced Lighting Model"/>
 			<menu_item_check label="Güneş/Ay/Projektörlerden Gelen Gölgeler" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO ve Gölge Yumuşatma" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL Hata Ayıklama" name="Debug GL"/>
@@ -323,7 +331,6 @@
 			<menu_item_check label="Animasyon Dokuları" name="Animation Textures"/>
 			<menu_item_check label="Dokuları Devre Dışı Bırak" name="Disable Textures"/>
 			<menu_item_check label="Tam Çöz. Dokular" name="Rull Res Textures"/>
-			<menu_item_check label="Doku Atlas (deneysel)" name="Texture Atlas"/>
 			<menu_item_check label="Eklenmiş Işıkları İşle" name="Render Attached Lights"/>
 			<menu_item_check label="Eklenmiş Parçacıkları İşle" name="Render Attached Particles"/>
 			<menu_item_check label="Parıldayan Nesneler Üzerine Gel" name="Hover Glow Objects"/>
@@ -359,7 +366,6 @@
 			<menu_item_call label="Odaklayıcı Tutucunun Dökümünü Al" name="Dump Focus Holder"/>
 			<menu_item_call label="Seçilen Nesne Bilgisini Yazdır" name="Print Selected Object Info"/>
 			<menu_item_call label="Aracı Bilgisini Yazdır" name="Print Agent Info"/>
-			<menu_item_call label="Bellek İstatistikleri" name="Memory Stats"/>
 			<menu_item_check label="Bölge Hata Ayıklama Konsolu" name="Region Debug Console"/>
 			<menu_item_check label="SelectMgr İçin Hata Ayıklama" name="Debug SelectMgr"/>
 			<menu_item_check label="Tıklamalar İçin Hata Ayıklama" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index ad92a4b478..492178ab82 100755
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -210,6 +210,14 @@ Bu Yetenek &apos;[ROLE_NAME]&apos; rolüne eklensin mi?
 Bu Yetenek &apos;[ROLE_NAME]&apos; rolüne eklensin mi?
 		<usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Gruptan [AVATAR_NAME] adlı üyeyi çıkarmak üzeresiniz.
+		<usetemplate ignoretext="Gruptan bir katılımcının çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Gruptan [COUNT] üyeyi çıkarmak üzeresiniz.
+		<usetemplate ignoretext="Gruptan birden çok üyenin çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Aksesuarınızı çıkarmak üzeresiniz.
     Devam etmek istediğinize emin misiniz?
@@ -1111,7 +1119,7 @@ bu simdeki TÜM ARAZİLERDEN SİLMEK istediğinize emin misiniz?
 Lütfen daha yüksek bir tutar girin.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Seçtiğiniz öğelerden en az birinin kendisine işaret eden bağlantılı öğeler var.  Bu öğeyi silerseniz, bağlantıları kalıcı olarak çalışmaz hale gelecek.  Önce bağlantıları silmeniz önemle tavsiye edilir.
+		Öğelerden en az birinde kendisine işaret eden bağlantılar var.  Bu öğeyi silerseniz, bağlantıları kalıcı olarak çalışmaz hale gelecek.  Önce bağlantıları silmeniz önemle tavsiye edilir.
 
 Bu öğeleri silmek istediğinize emin misiniz?
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
@@ -1479,14 +1487,44 @@ Sürüm [VERSION] [[RELEASE_NOTES_FULL_URL] Bu güncelleme hakkında ayrıntıl
 		<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi kur ve [APP_NAME] uygulamasını yeniden başlat"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
-		Gerekli bir yazılım güncellemesini karşıdan yükledik.
-Sürüm [VERSION]
+		Gerekli bir yazılım güncellemesi indirdik.
+Sürüm [VERSION] [[INFO_URL] Bu güncelleme hakkında ayrıntılı bilgi]
 
-Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
-		Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+		Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+[[INFO_URL] Bu güncelleme hakkında bilgi]
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		[APP_NAME] kurulumunuz için bir güncelleme indirdik.
+Sürüm [VERSION] 
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [bu güncelleme hakkında bilgi için [INFO_URL]]
+		<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi yükle ve [APP_NAME] uygulamasını yeniden başlat"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		[APP_NAME] kurulumunuz için bir güncelleme indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
+		<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi yükle ve [APP_NAME] uygulamasını yeniden başlat"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Gerekli bir yazılım güncellemesi indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
+
+Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1537,6 +1575,10 @@ Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız
 Gruptan ayrılmak istiyor musunuz?
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		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="ConfirmKick">
 		Tüm Sakinleri GERÇEKTEN ağ dışına çıkarmak istiyor musunuz?
 		<usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tüm Sakinleri Çıkar"/>
@@ -2396,9 +2438,7 @@ Lütfen tek bir nesne seçin.
     &apos;Işınla&apos; seçimini yapabilirsiniz.)
 	</notification>
 	<notification name="TeleportToPerson">
-		&apos;[NAME]&apos; gibi sakinlerle bağlantıya geçmek için &quot;Kişiler&quot; düğmesine tıklayın, açılan pencereden bir Sakin seçin ve sonra
-    pencerenin altında &apos;Anlık İleti&quot; üzerine tıklayın.
-    (Listede adlarına çift tıklayarak veya sağ tıklayıp &quot;Anlık İleti&quot;yi seçerek de bunu yapabilirsiniz.)
+		Biriyle özel bir sohbet başlatmak için, avatarlarına sağ tıklayın ve menüden &quot;Aİ&quot; seçimini yapın.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Sunucunun sınırları dışındaki arazi seçilemez.
@@ -2772,6 +2812,15 @@ Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, eriş
 			<button name="Deny" text="Reddet"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		&apos;[NAME]&apos; tarafından sahip olunan bir nesne olan &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; tarafından istenen çalışma zamanı komut dosyası izni görüntüleyici tarafından tanınmadı ve verilemez.
+
+Bu izni vermek için lütfen [DOWNLOADURL] adresinden görüntüleyicinizi en son sürüme güncelleyin.
+		<form name="form">
+			<button name="Deny" text="Tamam"/>
+			<button name="Mute" text="Engelle"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		[NAME] adlı kişiye ait &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 08efd0aa61..b499ec8307 100755
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -49,6 +49,9 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
 				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
 			</panel>
+			<text name="groupcount">
+				[COUNT] gruba üyesiniz, daha [REMAINING] gruba üye olabilirsiniz.
+			</text>
 		</panel>
 		<panel label="SON" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index aaeebdfe6e..d46f3e08cc 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<panel>
+	<panel name="general_chat_settings">
 		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
 		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
 		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
@@ -14,19 +14,17 @@
 		</combo_box>
 		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			Bildirimler
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			Arkadaş Aİ&apos;leri:
 		</text>
 		<combo_box name="FriendIMOptions">
 			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
 			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			Arkadaş harici Aİ&apos;ler:
 		</text>
@@ -34,40 +32,54 @@
 			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
 			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			Konferans Aİ&apos;leri:
 		</text>
 		<combo_box name="ConferenceIMOptions">
 			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
 			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			Grup sohbeti:
 		</text>
 		<combo_box name="GroupChatOptions">
 			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
 			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			Yakındaki sohbet:
 		</text>
 		<combo_box name="NearbyChatOptions">
 			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			Nesne Aİ&apos;leri:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
 			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			Sesi çal:
 		</text>
@@ -76,7 +88,7 @@
 		<check_box label="Işınlama teklifi" name="teleport_offer"/>
 		<check_box label="Envanter teklifi" name="inventory_offer"/>
 	</panel>
-	<panel>
+	<panel name="log_settings">
 		<button label="Günlüğü temizle..." name="clear_log"/>
 		<button label="Dökümleri sil..." name="delete_transcripts"/>
 		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
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 ddb83ffc69..25c9e966c7 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
 		<check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
 		<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Işıklandırma ve Gölgeler" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Ortam Gölgeleme" name="UseSSAO"/>
 		<check_box initial_value="true" label="Alan Derinliği" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index 9d03d9b01d..2039761748 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Otomatik olarak kurulsun" name="Install_automatically"/>
 		<combo_box.item label="Güncelleştirmeler manuel olarak karşıdan yüklensin ve kurulsun" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Sürüm adaylarına güncelleme yapmaya gönüllü" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Proxy Ayarları:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
index 7aa1da6fb2..79cd86c3f0 100755
--- a/indra/newview/skins/default/xui/tr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Tümünü Seç" name="Select All"/>
 			<menu_item_call label="Seçimi Kaldır" name="Deselect"/>
 			<menu_item_call label="Ara / Değiştir..." name="Search / Replace..."/>
+			<menu_item_call label="Şu satıra git:" name="Go to line..."/>
 		</menu>
 		<menu label="Yardım" name="Help">
 			<menu_item_call label="Yardım..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
new file mode 100644
index 0000000000..2ce7c9c11f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Doku" name="Texture">
+	<panel.string name="string repeats per meter">
+		Metrede Kaç Kez Tekrarlandığı
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Bir Yüzde Kaç Kez Tekrarlandığı
+	</panel.string>
+	<text name="color label">
+		Renk
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Renk seçiciyi açmak için tıklayın"/>
+	<text name="color trans">
+		Saydamlık %
+	</text>
+	<text name="glow label">
+		Parıltı
+	</text>
+	<check_box label="Tam Parlak" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Malzemeler" name="Materials"/>
+		<combo_box.item label="Ortam" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Doku (yayılmış)" name="Texture (diffuse)"/>
+		<combo_box.item label="Yumruluk (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Parıldama (yansıtan)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Doku" name="texture control" tool_tip="Bir resim seçmek için tıklayın"/>
+	<text name="label alphamode">
+		Alfa modu
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Hiçbiri" name="None"/>
+		<combo_box.item label="Alfa karıştırma" name="Alpha blending"/>
+		<combo_box.item label="Alfa maskeleme" name="Alpha masking"/>
+		<combo_box.item label="Yayımlatıcı maske" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Maske kesimi
+	</text>
+	<texture_picker label="Doku" name="bumpytexture control" tool_tip="Bir resim seçmek için tıklayın"/>
+	<text name="label bumpiness">
+		Yumruluk
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Yok" name="None"/>
+		<combo_box.item label="Parlaklık" name="Brightness"/>
+		<combo_box.item label="Koyuluk" name="Darkness"/>
+		<combo_box.item label="damarlı ahşap" name="woodgrain"/>
+		<combo_box.item label="ağaç kabuğu" name="bark"/>
+		<combo_box.item label="tuğlalar" name="bricks"/>
+		<combo_box.item label="dama tahtası" name="checker"/>
+		<combo_box.item label="beton" name="concrete"/>
+		<combo_box.item label="sert çini" name="crustytile"/>
+		<combo_box.item label="kesilmiş taş" name="cutstone"/>
+		<combo_box.item label="diskler" name="discs"/>
+		<combo_box.item label="çakıl" name="gravel"/>
+		<combo_box.item label="petri kabı" name="petridish"/>
+		<combo_box.item label="dış kaplama" name="siding"/>
+		<combo_box.item label="taş çini" name="stonetile"/>
+		<combo_box.item label="stükko" name="stucco"/>
+		<combo_box.item label="vakum" name="suction"/>
+		<combo_box.item label="örgü" name="weave"/>
+	</combo_box>
+	<texture_picker label="Doku" name="shinytexture control" tool_tip="Bir resim seçmek için tıklayın"/>
+	<text name="label shininess">
+		Parıldama
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Yok" name="None"/>
+		<combo_box.item label="Düşük" name="Low"/>
+		<combo_box.item label="Orta" name="Medium"/>
+		<combo_box.item label="Yüksek" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Pürüzsüzlük
+	</text>
+	<text name="label environment">
+		Ortam
+	</text>
+	<text name="label shinycolor">
+		Renk
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Renk seçiciyi açmak için tıklayın"/>
+	<text name="media_info">
+		Varsa, seçilen ortamın URL&apos;si burada yer alır
+	</text>
+	<button label="Seç..." name="add_media" tool_tip="Ortam Ekle"/>
+	<button label="Kaldır" name="delete_media" tool_tip="Bu ortam dokusunu sil"/>
+	<button label="Hizala" label_selected="Ortamı Hizala" name="button align" tool_tip="Ortam dokusunu hizala (önce yüklenmelidir)"/>
+	<text name="tex gen">
+		Eşleştirme
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Varsayılan" name="Default"/>
+		<combo_box.item label="Planar" name="Planar"/>
+	</combo_box>
+	<spinner label="Yatay ölçek" name="TexScaleU"/>
+	<spinner label="Dikey ölçek" name="TexScaleV"/>
+	<spinner label="Metrede kaç kez tekrarlandığı" name="rptctrl"/>
+	<spinner label="Dönüş derecesi" name="TexRot"/>
+	<spinner label="Yatay ofset" name="TexOffsetU"/>
+	<spinner label="Dikey ofset" name="TexOffsetV"/>
+	<spinner label="Yatay ölçek" name="bumpyScaleU"/>
+	<spinner label="Dikey ölçek" name="bumpyScaleV"/>
+	<spinner label="Dönüş derecesi" name="bumpyRot"/>
+	<spinner label="Yatay ofset" name="bumpyOffsetU"/>
+	<spinner label="Dikey ofset" name="bumpyOffsetV"/>
+	<spinner label="Yatay ölçek" name="shinyScaleU"/>
+	<spinner label="Dikey ölçek" name="shinyScaleV"/>
+	<spinner label="Dönüş derecesi" name="shinyRot"/>
+	<spinner label="Yatay ofset" name="shinyOffsetU"/>
+	<spinner label="Dikey ofset" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Planar yüzleri hizala" name="checkbox planar align" tool_tip="Tüm seçili yüzeylerdeki dokuları son seçili yüzdekiyle hizalar. Planar doku eşleştirmesi gerektirir."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
index 655ac64172..76ca58c319 100755
--- a/indra/newview/skins/default/xui/tr/role_actions.xml
+++ b/indra/newview/skins/default/xui/tr/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Bu yetenekler arasında parsel adını ve yayınlama ayarlarını, Bul dizinindeki görünürlük ile iniş noktası ve TP yönlendirme seçeneklerini değiştirme imkanları yer alır." name="Parcel Identity">
 		<action description="&apos;Konumu Arama Sonuçlarında Göster&apos; seçeneğini Aç/Kapa ve kategoriyi ayarla" longdescription="Arazi Hakkında &gt; Seçenekler sekmesinden &apos;Konumu Arama Sonuçlarında Göster&apos; seçeneğini Açın/Kapayın ve parsel kategorisini ayarlayın." name="land find places" value="17"/>
-		<action description="Parsel adını, açıklamasını ve &quot;Konumu Arama Sonuçlarında Göster&quot; ayarlarını değiştir" longdescription="Parsel adını, açıklamasını ve &quot;Konumu Arama Sonuçlarında Göster&quot; ayarlarını değiştirin. Bu işlem Arazi Hakkında &gt; Seçenekler sekmesinde yapılır." name="land change identity" value="18"/>
+		<action description="Parsel adını, açıklamasını ve &quot;Orta Seviyede İçerik&quot; ayarlarını değiştir" longdescription="Parsel adını, açıklamasını ve &quot;Orta Seviyede İçerik&quot; ayarlarını değiştir. Bu işlem Arazi Hakkında &gt; Seçenekler sekmesinde yapılır." name="land change identity" value="18"/>
 		<action description="İniş noktasını ve ışınlama yönlendirmesini ayarlayın" longdescription="Bir grubun sahip olduğu parsel üzerinde, bu Yeteneğe sahip olan bir Roldeki Üyeler gelen ışınlanmaların varacağı iniş noktasını ve daha fazla kontrol için ışınlama yönlendirmesini ayarlayabilirler. Bu işlem Arazi Hakkında &gt; Seçenekler sekmesinde yapılır." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Bu Yeteneklere &apos;Nesneleri Oluştur&apos;, &apos;Yüzeyi Düzenle&apos;, müzik ve ortam ayarları gibi parsel seçeneklerini etkileyen güçler de dahildir." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 155dc8749a..5a809ea783 100755
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -139,6 +139,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
 http://secondlife.com/download
@@ -448,6 +451,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="SLappAgentRequestFriend">
 		Arkadaşlık Talebi
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Arkadaşların Çıkarılması
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Kapat (⌘W)
 	</string>
@@ -835,6 +841,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="multiple_textures">
 		Birden Çok
 	</string>
+	<string name="use_texture">
+		Dokuyu kullan
+	</string>
 	<string name="texture_loading">
 		Yükleniyor...
 	</string>
@@ -934,6 +943,21 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="TeleportYourAgent">
 		Sizi ışınlama
 	</string>
+	<string name="JoinAnExperience">
+		Bir tecrübeye katıl
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Gayri menkul erişim listelerini yönetirken uyarıları bastır
+	</string>
+	<string name="OverrideYourAnimations">
+		Varsayılan animasyonlarınızı değiştirin
+	</string>
+	<string name="ScriptReturnObjects">
+		Kendi adınıza nesneler iade edin
+	</string>
+	<string name="UnknownScriptPermission">
+		(bilinmiyor)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -1965,6 +1989,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		BÜG Sağ Alt
 	</string>
+	<string name="ATTACH_NECK">
+		Boyun
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Avatar Merkezi
+	</string>
 	<string name="CursorPos">
 		Satır [LINE], Sütun [COLUMN]
 	</string>
@@ -2994,6 +3024,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="Hip Width">
 		Kalça Genişliği
 	</string>
+	<string name="Hover">
+		Üzerine getir
+	</string>
 	<string name="In">
 		İçeri
 	</string>
@@ -5088,4 +5121,7 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="logging_calls_enabled_log_empty">
 		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
 	</string>
+	<string name="loading_chat_logs">
+		Yükleniyor...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 1193243c7e..2dfb35fa54 100755
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -9,6 +9,8 @@
 	</floater.string>
 	<floater.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;
+（全域坐標：[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]）
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index 59751a3a46..c103ea938f 100755
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="編輯內容物權限">
+<floater name="floaterbulkperms" title="調整內容物權限">
 	<floater.string name="nothing_to_modify_text">
 		選擇未包含可編輯的內容物。
 	</floater.string>
@@ -24,7 +24,7 @@
 	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
 	<text name="newperms">
-		新內容物權限
+		調整內容物權限：
 	</text>
 	<text name="GroupLabel">
 		群組：
@@ -40,6 +40,7 @@
 	<check_box label="修改" name="next_owner_modify"/>
 	<check_box label="恚庨" name="next_owner_copy"/>
 	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="下一個所有人可贈送或轉售這個物件"/>
-	<button label="確定" name="apply"/>
+	<button label="確定" name="ok"/>
+	<button label="套用" name="apply"/>
 	<button label="取消" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_goto_line.xml b/indra/newview/skins/default/xui/zh/floater_goto_line.xml
new file mode 100644
index 0000000000..e0215aef8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="前往某行數">
+	<button label="確定" label_selected="確定" name="goto_btn"/>
+	<text name="txt">
+		前往某行數
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index d63c5507db..864af2e592 100755
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -34,13 +34,11 @@
 			<layout_panel name="body_panel">
 				<layout_stack name="im_panels">
 					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index d0978b8b01..be009b54d8 100755
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				顯示：
 			</text>
-			<check_box label="測試" name="show_world"/>
+			<check_box label="世界" name="show_world"/>
 			<check_box label="僅限可移動的" name="show_world_movables_only"/>
 			<check_box label="導航網面" name="show_navmesh"/>
 			<text name="show_walkability_label">
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 885c4b9add..41b3409627 100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="凍結" name="Freeze..."/>
 	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
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 c14a98c64b..eb1bad0ca2 100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的個人檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="丟棄" name="Drop"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
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 1d02464748..dc035bafa0 100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="凍結" name="Freeze..."/>
 	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
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 32757bbff6..68d0600141 100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的個人檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
index 507255d0c0..adfeefc337 100644
--- a/indra/newview/skins/default/xui/zh/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="關閉交談" name="close_conversation"/>
 	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
 	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+	<menu_item_call label="關閉所選" name="close_selected_conversations"/>
 	<menu_item_call label="察看檔案" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml
index a87ab77dd0..3ad9c0ab31 100755
--- a/indra/newview/skins/default/xui/zh/menu_land.xml
+++ b/indra/newview/skins/default/xui/zh/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="購買通行權" name="Land Buy Pass"/>
 	<menu_item_call label="建造" name="Create"/>
 	<menu_item_call label="編輯地形" name="Edit Terrain"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index c327b132a1..1d3d771efb 100755
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="顯示 TOS" name="TOS"/>
 		<menu_item_call label="顯示嚴重訊息" name="Critical"/>
 		<menu_item_call label="網頁內容浮動視窗除錯測試" name="Web Content Floater Debug Test"/>
-		<menu label="設定記錄細節" name="Set Logging Level"/>
+		<menu label="設定記錄細節" name="Set Logging Level">
+			<menu_item_check label="除錯" name="Debug"/>
+			<menu_item_check label="資訊" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="錯誤" name="Error"/>
+			<menu_item_check label="無" name="None"/>
+		</menu>
 		<menu_item_check label="顯示網格挑選器" name="Show Grid Picker"/>
 		<menu_item_call label="顯示通知控制台" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_mute_particle.xml b/indra/newview/skins/default/xui/zh/menu_mute_particle.xml
new file mode 100644
index 0000000000..fbde9b435d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index 4282c1e131..f6657d876e 100755
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
@@ -3,13 +3,13 @@
 	<menu_item_call label="觸碰" name="Object Touch"/>
 	<menu_item_call label="編輯" name="Edit..."/>
 	<menu_item_call label="建造" name="Build"/>
-	<menu_item_call label="在聯結集裡顯示" name="show_in_linksets"/>
-	<menu_item_call label="在角色中顯示" name="show_in_characters"/>
 	<menu_item_call label="打開" name="Open"/>
 	<menu_item_call label="坐在這裡" name="Object Sit"/>
 	<menu_item_call label="起立" name="Object Stand Up"/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
 	<menu_item_call label="放大" name="Zoom In"/>
+	<menu_item_call label="在聯結集裡顯示" name="show_in_linksets"/>
+	<menu_item_call label="在角色中顯示" name="show_in_characters"/>
 	<context_menu label="穿上" name="Put On">
 		<menu_item_call label="穿上" name="Wear"/>
 		<menu_item_call label="添加" name="Add"/>
@@ -26,4 +26,5 @@
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="購買" name="Buy..."/>
 	<menu_item_call label="刪除" name="Delete"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 72629822d4..752634dc6b 100755
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="察看檔案" name="show_agent"/>
 	<menu_item_call label="送出 IM..." name="send_im"/>
 	<menu_item_call label="加為朋友..." name="add_friend"/>
+	<menu_item_call label="移除朋友…" name="remove_friend"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index 9f3a9d58ff..ac366f92ef 100755
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="物件檔案..." name="show_object"/>
+	<menu_item_call label="封鎖…" name="block_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index d4844b191b..b267bda2bb 100755
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
 			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="狀態" name="Status"/>
+		<menu label="狀態" name="Status">
+			<menu_item_check label="離開" name="Away"/>
+			<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="Manage My Account"/>
@@ -30,6 +33,7 @@
 		<menu_item_check label="交談……" name="Conversations"/>
 		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
 		<menu_item_check label="說話" name="Speak"/>
+		<menu_item_check label="交談記錄…" name="Conversation Log..."/>
 		<menu label="語音變聲" name="VoiceMorphing">
 			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
 			<menu_item_check label="預覽……" name="Preview"/>
@@ -40,6 +44,7 @@
 		<menu_item_check label="群組" name="My Groups"/>
 		<menu_item_check label="附近的人群" name="Active Speakers"/>
 		<menu_item_call label="封鎖清單" name="Block List"/>
+		<menu_item_check label="請勿打擾" name="Do Not Disturb"/>
 	</menu>
 	<menu label="世界" name="World">
 		<menu_item_call label="將此處記為地標" name="Create Landmark Here"/>
@@ -108,6 +113,7 @@
 			<menu_item_call label="包括下一部位" name="Include Next Part"/>
 			<menu_item_call label="包括上一部位" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="聯結集…" name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="聚焦於所選部位" name="Focus on Selection"/>
 		<menu_item_call label="縮放至所選部位" name="Zoom to Selection"/>
 		<menu label="物件" name="Object">
@@ -277,6 +283,7 @@
 			<menu_item_check label="隨機變動幀率" name="Randomize Framerate"/>
 			<menu_item_check label="定期出現慢幀率" name="Periodic Slow Frame"/>
 			<menu_item_check label="畫面測試" name="Frame Test"/>
+			<menu_item_call label="幀特性" name="Frame Profile"/>
 		</menu>
 		<menu label="呈像的元資料" name="Render Metadata">
 			<menu_item_check label="外框箱" name="Bounding Boxes"/>
@@ -311,9 +318,10 @@
 			<menu_item_check label="軸" name="Axes"/>
 			<menu_item_check label="切線基礎" name="Tangent Basis"/>
 			<menu_item_call label="已選取材質資訊基礎" name="Selected Texture Info Basis"/>
+			<menu_item_call label="所選材料資訊" name="Selected Material Info"/>
 			<menu_item_check label="線框" name="Wireframe"/>
 			<menu_item_check label="物件導向的遮蔽" name="Object-Object Occlusion"/>
-			<menu_item_check label="光線和陰影" name="Advanced Lighting Model"/>
+			<menu_item_check label="進階照明模型" name="Advanced Lighting Model"/>
 			<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL 除錯" name="Debug GL"/>
@@ -323,7 +331,6 @@
 			<menu_item_check label="動作材質" name="Animation Textures"/>
 			<menu_item_check label="關閉材質" name="Disable Textures"/>
 			<menu_item_check label="全解析度材質" name="Rull Res Textures"/>
-			<menu_item_check label="材質圖集（實驗性質）" name="Texture Atlas"/>
 			<menu_item_check label="使附著燈光呈像" name="Render Attached Lights"/>
 			<menu_item_check label="使附著例子效果呈像" name="Render Attached Particles"/>
 			<menu_item_check label="停懸發光物件" name="Hover Glow Objects"/>
@@ -359,7 +366,6 @@
 			<menu_item_call label="傾印焦點容器" name="Dump Focus Holder"/>
 			<menu_item_call label="列印所選物件資訊" name="Print Selected Object Info"/>
 			<menu_item_call label="列印用戶資訊" name="Print Agent Info"/>
-			<menu_item_call label="計憶體狀態" name="Memory Stats"/>
 			<menu_item_check label="地區除錯控制台" name="Region Debug Console"/>
 			<menu_item_check label="除錯 SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="除錯點按動作" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 59be26d43b..864f20fc15 100755
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -210,6 +210,14 @@
 你仍要新增這項能力給「[ROLE_NAME]」？
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		你即將把 [AVATAR_NAME] 踢出群組。
+		<usetemplate ignoretext="確定將某人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		你即將把 [COUNT] 個人踢出群組。
+		<usetemplate ignoretext="確定將多人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		你即將卸除你的附件。
     你確定你要繼續？
@@ -1470,13 +1478,43 @@ SHA1 指紋：[MD5_DIGEST]
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		我們已下載了一個必要的軟體更新。
-版本：[VERSION]
+[VERSION] 版本 [[INFO_URL] 關於此更新的資訊]
 
 我門必須重新啟動 [APP_NAME] 以安裝更新。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		我門必須重新啟動 [APP_NAME] 以安裝更新。
+[[INFO_URL] 關於此更新的資訊]
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		我們已為你的 [APP_NAME] 軟體下載了更新。
+版本：[VERSION] 
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 此更新版的詳情]
+		<usetemplate name="okcancelbuttons" notext="稍候..." yestext="立即安裝並重新啟動 [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		我們已為你的 [APP_NAME] 軟體下載了更新。
+版本：[VERSION]
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 介紹此更新版的資訊]
+		<usetemplate name="okcancelbuttons" notext="稍候…" yestext="立即安裝並重新啟動 [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		我們已下載了一個必要的軟體更新。
+版本：[VERSION]
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 介紹此更新版的資訊]
+
+我們必須重新啟動 [APP_NAME] 以便安裝更新。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		我們必須重新啟動 [APP_NAME] 以便安裝更新。
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 介紹此更新版的資訊]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1527,6 +1565,10 @@ SHA1 指紋：[MD5_DIGEST]
 是否要離開群組？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		無法離開群組。 你是此群組僅存的所有人，不得離開群組。 請先把所有人職銜指派給另一人。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmKick">
 		你確定要踢出這網格內的全部居民？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出全部居民"/>
@@ -2386,9 +2428,7 @@ SHA1 指紋：[MD5_DIGEST]
     （你還可以直接按兩下那個地標，或按滑鼠右鍵，選擇「瞬間傳送」。）
 	</notification>
 	<notification name="TeleportToPerson">
-		要聯絡如「[NAME]」的任何一位居民，請點按「人群」按鈕，從打開的視窗中選擇一位居民，再點按視窗底下的「IM」。
-
-    （你還可以從清單直接按兩下名字，或按滑鼠右鍵，選擇「IM」。）
+		要和某人私下交談，請右鍵點按化身，再點按選單的「IM」。
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		無法選擇超出伺服器邊界的土地。
@@ -2762,6 +2802,15 @@ SHA1 指紋：[MD5_DIGEST]
 			<button name="Deny" text="拒絕"/>
 		</form>
 	</notification>
+	<notification name="UnknownScriptQuestion">
+		由 &apos;[NAME]&apos; 所擁有的物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 正請求某項執行時期腳本權限，但本瀏覽器無法辨識該權限，故不允准。
+
+欲准許此權限，請從 [DOWNLOADURL] 下載並更新為最新版瀏覽器。
+		<form name="form">
+			<button name="Deny" text="確定"/>
+			<button name="Mute" text="封鎖"/>
+		</form>
+	</notification>
 	<notification name="ScriptDialog">
 		[NAME] 的 &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 5f7aca387a..da5918d553 100755
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -49,6 +49,9 @@
 				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
 				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
+			<text name="groupcount">
+				你目前屬於 [COUNT] 個群組，可再加入 [REMAINING] 個。
+			</text>
 		</panel>
 		<panel label="最近" name="recent_panel">
 			<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index e700e35516..b5cdddc252 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<panel>
-		<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="聊天時呈現打字動作" name="play_typing_animation"/>
 		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-		<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+		<check_box label="只允許我的朋友和群組與我通話或 IM 給我" name="voice_call_friends_only_check"/>
 		<text name="font_size">
-			字型尺寸：
+			字型大小：
 		</text>
 		<combo_box name="chat_font_size">
 			<item label="小" name="Small" value="0"/>
@@ -14,10 +14,7 @@
 		</combo_box>
 		<check_box label="聊天泡泡" name="bubble_text_chat"/>
 	</panel>
-	<panel>
-		<text name="notifications">
-			通知
-		</text>
+	<panel name="im_notification_settings">
 		<text name="friend_ims">
 			朋友 IM：
 		</text>
@@ -25,8 +22,9 @@
 			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
 			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="播放聲音" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
 			非朋友 IM：
 		</text>
@@ -34,8 +32,9 @@
 			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
 			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="播放聲音" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
 			多方交談 IM：
 		</text>
@@ -43,8 +42,9 @@
 			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
 			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="播放聲音" name="play_sound_conference_im"/>
 		<text name="group_chat">
 			群組聊天：
 		</text>
@@ -52,8 +52,9 @@
 			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
 			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="播放聲音" name="play_sound_group_chat_im"/>
 		<text name="nearby_chat">
 			附近的聊天：
 		</text>
@@ -61,13 +62,24 @@
 			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
 			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
 			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			來自物件的 IM：
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
 		</combo_box>
+		<check_box label="播放聲音" name="play_sound_object_im"/>
 		<text name="notifications_alert">
 			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
 		</text>
 	</panel>
-	<panel>
+	<panel name="play_sound_settings">
 		<text name="play_sound">
 			播放聲音：
 		</text>
@@ -76,9 +88,9 @@
 		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
 		<check_box label="收納物品贈送" name="inventory_offer"/>
 	</panel>
-	<panel>
-		<button label="清空記錄……" name="clear_log"/>
-		<button label="刪除交談內容記錄……" name="delete_transcripts"/>
+	<panel name="log_settings">
+		<button label="清空記錄…" name="clear_log"/>
+		<button label="刪除交談內容記錄…" name="delete_transcripts"/>
 		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
 	</panel>
 	<button label="翻譯…" name="ok_btn"/>
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 3948a48992..2311eb99a7 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="本地光線" name="LocalLights"/>
 		<check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/>
 		<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="光線和陰影" name="UseLightShaders"/>
+		<check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
 		<check_box initial_value="true" label="環境光遮蔽" name="UseSSAO"/>
 		<check_box initial_value="true" label="景深" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index a607a7c33b..0fcc49b203 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="自動安裝" name="Install_automatically"/>
 		<combo_box.item label="手動下載及安裝" name="Install_manual"/>
 	</combo_box>
+	<check_box label="願意在更新時搶先試用釋出候選版" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		代理伺服器設定：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index 29e9a35869..198e59be7b 100755
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="全選" name="Select All"/>
 			<menu_item_call label="取消選擇" name="Deselect"/>
 			<menu_item_call label="搜尋 / 取代..." name="Search / Replace..."/>
+			<menu_item_call label="前往某行數…" name="Go to line..."/>
 		</menu>
 		<menu label="幫助" name="Help">
 			<menu_item_call label="幫助..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
new file mode 100644
index 0000000000..5ea6d818c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="材質" name="Texture">
+	<panel.string name="string repeats per meter">
+		每公尺重覆次數
+	</panel.string>
+	<panel.string name="string repeats per face">
+		每一面重覆次數
+	</panel.string>
+	<text name="color label">
+		顏色
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="點按以開啟顏色挑選器"/>
+	<text name="color trans">
+		透明度 %
+	</text>
+	<text name="glow label">
+		光暈
+	</text>
+	<check_box label="全亮" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="材料" name="Materials"/>
+		<combo_box.item label="媒體" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="材質（漫反射圖）" name="Texture (diffuse)"/>
+		<combo_box.item label="凹凸度（正交）" name="Bumpiness (normal)"/>
+		<combo_box.item label="閃亮度（鏡反光）" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="材質" name="texture control" tool_tip="點按以挑選圖片"/>
+	<text name="label alphamode">
+		半透明模式
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="無" name="None"/>
+		<combo_box.item label="半透明攙混" name="Alpha blending"/>
+		<combo_box.item label="半透明遮罩" name="Alpha masking"/>
+		<combo_box.item label="自發光遮罩" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		遮罩截斷值
+	</text>
+	<texture_picker label="材質" name="bumpytexture control" tool_tip="點按以挑選圖片"/>
+	<text name="label bumpiness">
+		凹凸度
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="無" name="None"/>
+		<combo_box.item label="亮度" name="Brightness"/>
+		<combo_box.item label="暗度" name="Darkness"/>
+		<combo_box.item label="木紋" name="woodgrain"/>
+		<combo_box.item label="樹皮" name="bark"/>
+		<combo_box.item label="磚" name="bricks"/>
+		<combo_box.item label="格子" name="checker"/>
+		<combo_box.item label="混凝土" name="concrete"/>
+		<combo_box.item label="粗花磚" name="crustytile"/>
+		<combo_box.item label="石磚" name="cutstone"/>
+		<combo_box.item label="圓盤" name="discs"/>
+		<combo_box.item label="碎石" name="gravel"/>
+		<combo_box.item label="培養皿" name="petridish"/>
+		<combo_box.item label="側邊片" name="siding"/>
+		<combo_box.item label="石磚格" name="stonetile"/>
+		<combo_box.item label="彩色沙岩" name="stucco"/>
+		<combo_box.item label="吸附" name="suction"/>
+		<combo_box.item label="編織" name="weave"/>
+	</combo_box>
+	<texture_picker label="材質" name="shinytexture control" tool_tip="點按以挑選圖片"/>
+	<text name="label shininess">
+		閃亮度
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="無" name="None"/>
+		<combo_box.item label="低" name="Low"/>
+		<combo_box.item label="中" name="Medium"/>
+		<combo_box.item label="高" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		光滑度
+	</text>
+	<text name="label environment">
+		環境
+	</text>
+	<text name="label shinycolor">
+		顏色
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="點按以開啟顏色挑選器"/>
+	<text name="media_info">
+		所選媒體如有 URL，置於此
+	</text>
+	<button label="選擇…" name="add_media" tool_tip="添加媒體"/>
+	<button label="移除" name="delete_media" tool_tip="刪除這個媒體材質"/>
+	<button label="對齊" label_selected="對齊媒體" name="button align" tool_tip="對齊媒體材質（須先載入）"/>
+	<text name="tex gen">
+		映射方式
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="預設" name="Default"/>
+		<combo_box.item label="平面" name="Planar"/>
+	</combo_box>
+	<spinner label="水平刻度" name="TexScaleU"/>
+	<spinner label="垂直刻度" name="TexScaleV"/>
+	<spinner label="每公尺重覆次數" name="rptctrl"/>
+	<spinner label="旋轉角度" name="TexRot"/>
+	<spinner label="水平偏距" name="TexOffsetU"/>
+	<spinner label="垂直偏距" name="TexOffsetV"/>
+	<spinner label="水平刻度" name="bumpyScaleU"/>
+	<spinner label="垂直刻度" name="bumpyScaleV"/>
+	<spinner label="旋轉角度" name="bumpyRot"/>
+	<spinner label="水平偏距" name="bumpyOffsetU"/>
+	<spinner label="垂直偏距" name="bumpyOffsetV"/>
+	<spinner label="水平刻度" name="shinyScaleU"/>
+	<spinner label="垂直刻度" name="shinyScaleV"/>
+	<spinner label="旋轉角度" name="shinyRot"/>
+	<spinner label="水平偏距" name="shinyOffsetU"/>
+	<spinner label="垂直偏距" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="對齊平面" name="checkbox planar align" tool_tip="以最後所選擇的面為基準，對齊全部所選擇的面上的材質。 這必須使用平面材質映射方式。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 767bcecde7..9587981444 100755
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="這些能力包括可更改地段名稱和發佈設定、設定是否公開到搜尋結果、設定登陸地點和瞬間傳送繞路選項。" name="Parcel Identity">
 		<action description="切換「將地點顯示在搜尋結果」設定，並選定類別" longdescription="切換「將地點顯示在搜尋結果」設定，並在「土地資料」&gt; 選項頁籤設定地段類別。" name="land find places" value="17"/>
-		<action description="更改地段名稱、描述，和「將地點顯示在搜尋結果」設定。" longdescription="更改地段名稱、描述，和「將地點顯示在搜尋結果」設定。 這可在「土地資料」&gt; 選項頁籤完成。" name="land change identity" value="18"/>
+		<action description="更改地段名稱、描述、「適度成人內容」設定" longdescription="更改地段名稱、描述、「適度成人內容」設定。 這可在「土地資料」&gt; 選項頁籤完成。" name="land change identity" value="18"/>
 		<action description="設定登陸地點和瞬間傳送繞路設定。" longdescription="在群組所有的地段上，身負具此能力的成員，可以設定人們瞬間傳送進來時的登陸地點，和瞬間傳送的繞路選項。 這可在「土地資料」&gt; 選項頁籤完成。" name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="這些能力包括有權更改地段選項，例如「新建物件」、「編輯地形」，和音樂、媒體設定等。" name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 31713ac281..d9fa105ef4 100755
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -139,6 +139,9 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		你目前所用的 Viewer 已經無法再進入第二人生。 請到這個頁面下載最新 Viewer：
 http://secondlife.com/download
@@ -443,6 +446,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="SLappAgentRequestFriend">
 		交友要求
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		移除朋友
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		關閉（⌘W）
 	</string>
@@ -830,6 +836,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="multiple_textures">
 		多個
 	</string>
+	<string name="use_texture">
+		使用材質
+	</string>
 	<string name="texture_loading">
 		載入中...
 	</string>
@@ -929,6 +938,21 @@ http://secondlife.com/viewer-access-faq
 	<string name="TeleportYourAgent">
 		瞬間傳送你本人
 	</string>
+	<string name="JoinAnExperience">
+		加入體驗
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		管理領出入許可名單時，不顯示警示
+	</string>
+	<string name="OverrideYourAnimations">
+		替換你預設的動作
+	</string>
+	<string name="ScriptReturnObjects">
+		為你送返物件
+	</string>
+	<string name="UnknownScriptPermission">
+		（未知）！
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -1960,6 +1984,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		擡頭顯示右下
 	</string>
+	<string name="ATTACH_NECK">
+		頸部
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		化身中心
+	</string>
 	<string name="CursorPos">
 		橫行 [LINE]，縱列 [COLUMN]
 	</string>
@@ -2989,6 +3019,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="Hip Width">
 		腰寬
 	</string>
+	<string name="Hover">
+		停懸
+	</string>
 	<string name="In">
 		向內
 	</string>
@@ -5085,4 +5118,7 @@ http://secondlife.com/viewer-access-faq
 	<string name="logging_calls_enabled_log_empty">
 		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
 	</string>
+	<string name="loading_chat_logs">
+		載入中…
+	</string>
 </strings>
-- 
cgit v1.2.3


From 33e70236f0226b2e4ebabccfa28cca04ff01211e Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Tue, 17 Sep 2013 17:01:52 -0700
Subject: MAINT-3161 : Clean up avatar muting code and prototype feature

---
 .../skins/default/xui/en/menu_attachment_other.xml | 24 ++++++++++----------
 .../skins/default/xui/en/menu_avatar_other.xml     | 26 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

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

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 47fae51fac..ba91b0b5d9 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -117,37 +117,37 @@
     
       <menu_item_check
         name="Normal"
-        label="Normal">
+        label="Normal Rendering">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="0" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="0" />
       </menu_item_check>
       <menu_item_check
-        name="Always use imposter"
-        label="Always use imposter">
+        name="Always use impostor"
+        label="Always use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="1" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="1" />
       </menu_item_check>
       <menu_item_check
-        name="Never use imposter"
-        label="Never use imposter">
+        name="Never use impostor"
+        label="Never use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="2" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="2" />
       </menu_item_check>
 
   <menu_item_separator
-       layout="topleft" />
+       layout="topleft" name="Impostor seperator"/>
 
   <menu_item_call
      enabled="false"
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 935b5b3ea0..8bd013f14b 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -110,37 +110,37 @@
     
       <menu_item_check
         name="Normal"
-        label="Normal">
+        label="Normal Rendering">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="0" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="0" />
       </menu_item_check>
       <menu_item_check
-        name="Always use imposter"
-        label="Always use imposter">
+        name="Always use impostor"
+        label="Always use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="1" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="1" />
       </menu_item_check>
       <menu_item_check
-        name="Never use imposter"
-        label="Never use imposter">
+        name="Never use impostor"
+        label="Never use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="2" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="2" />
       </menu_item_check>
 
-  <menu_item_separator
-       layout="topleft" />
+  <menu_item_separator 
+    layout="topleft"  name="Impostor seperator"/>
 
   <menu_item_call
      enabled="false"
-- 
cgit v1.2.3


From 4c9d9e3878180599c1236dc873aa53b8a880645a Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Wed, 18 Sep 2013 11:14:12 +0300
Subject: MAINT-3152 FIXED [MAINTENANCE RC] Confusing naming of Lighting and
 Shadows/Advanced Lighting Model options in graphics preferences

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

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

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 3c9508bb74..6c485c0595 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -244,7 +244,7 @@
      invisiblity_control="ShowAdvancedGraphicsSettings"
 		 height="16"
 		 initial_value="true"
-		 label="Lighting and Shadows"
+		 label="Advanced Lighting Model"
 		 layout="topleft"
 		 left="30"
 		 name="UseLightShaders2"
-- 
cgit v1.2.3


From 1c2bbf6ccbadfdbfaadb0b750a950e0d6add6fb8 Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Wed, 18 Sep 2013 11:34:25 +0300
Subject: MAINT-3148 FIXED PgUp Key forces fly toggle instead of jump (maint RC
 only)

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 60272887c9..2d65052def 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -93,7 +93,7 @@
         <menu_item_check
          label="Fly"
          name="Fly"
-         shortcut="PGUP">
+         shortcut="HOME">
           <menu_item_check.on_check
            function="Agent.getFlying" />
           <menu_item_check.on_click
@@ -104,7 +104,7 @@
         <menu_item_call
          label="Stop flying"
          name="Stop flying"
-         shortcut="PGDN">
+         shortcut="HOME">
           <menu_item_call.on_click
            function="Agent.toggleFlying" />
           <menu_item_call.on_enable
-- 
cgit v1.2.3